Merge a24bca3258 into 4c61c551aa

readline/history.go

@@ -128,19 +128,15 @@ func (rl *Instance) walkHistory(i int) {
 	}
 
 	rl.histOffset += i
-	historyLen := history.Len()
 	if rl.histOffset == 0 {
 		rl.line = []rune(rl.lineBuf)
 		rl.pos = len(rl.lineBuf)
 	} else if rl.histOffset <= -1 {
 		rl.histOffset = 0
-	} else if rl.histOffset > historyLen {
-		// TODO: should this wrap around?s
-		rl.histOffset = 0
 	} else {
 		dedup = true
 		old = string(rl.line)
-		new, err = history.GetLine(historyLen - rl.histOffset)
+		new, err = history.GetLine(history.Len() - rl.histOffset)
 		if err != nil {
 			rl.resetHelpers()
 			print("\r\n" + err.Error() + "\r\n")