Merge d47d23ea3e into 38d036d96f

readline/history.go

@@ -128,15 +128,19 @@ 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(history.Len() - rl.histOffset)
+		new, err = history.GetLine(historyLen - rl.histOffset)
 		if err != nil {
 			rl.resetHelpers()
 			print("\r\n" + err.Error() + "\r\n")

vars_linux.go

@@ -1,21 +0,0 @@
-// +build linux
-
-package main
-
-// String vars that are free to be changed at compile time
-var (
-	requirePaths = commonRequirePaths + `.. ';'
-	.. hilbish.dataDir .. '/libs/?/init.lua;'
-	.. hilbish.dataDir .. '/libs/?/?.lua;'` + linuxUserPaths
-	linuxUserPaths = `
-	.. hilbish.userDir.data     .. '/hilbish/libs/?/init.lua;'
-	.. hilbish.userDir.data	    .. '/hilbish/libs/?/?.lua;'
-	.. hilbish.userDir.data	    .. '/hilbish/libs/?.lua;'
-	.. hilbish.userDir.config	.. '/hilbish/?/init.lua;'
-	.. hilbish.userDir.config	.. '/hilbish/?/?.lua;'
-	.. hilbish.userDir.config	.. '/hilbish/?.lua'`
-	dataDir = "/usr/local/share/hilbish"
-	preloadPath = dataDir + "/nature/init.lua"
-	sampleConfPath = dataDir + "/.hilbishrc.lua" // Path to default/sample config
-	defaultConfDir = ""
-)

vars_unix.go

@@ -1,4 +1,4 @@
-// +build freebsd
+// +build linux freebsd
 
 package main
 
@@ -6,8 +6,8 @@ package main
 var (
 	requirePaths = commonRequirePaths + `.. ';'
 	.. hilbish.dataDir .. '/libs/?/init.lua;'
-	.. hilbish.dataDir .. '/libs/?/?.lua;'` + freebsdUserPaths
-	freebsdUserPaths = `
+	.. hilbish.dataDir .. '/libs/?/?.lua;'` + unixUserPaths
+	unixUserPaths = `
 	.. hilbish.userDir.data     .. '/hilbish/libs/?/init.lua;'
 	.. hilbish.userDir.data	    .. '/hilbish/libs/?/?.lua;'
 	.. hilbish.userDir.data	    .. '/hilbish/libs/?.lua;'