api.go

@@ -325,7 +325,6 @@ func hlprompt(t *rt.Thread, c *rt.GoCont) (rt.Cont, error) {
 		return nil, err
 	}
 	typ := "left"
-	// optional 2nd arg
 	if len(c.Etc()) != 0 {
 		ltyp := c.Etc()[0]
 		var ok bool

exec.go

@@ -42,13 +42,13 @@ func runInput(input string, priv bool) {
 					cmdFinish(0, input, priv)
 					return
 				}
-				input, exitCode, err = handleSh(input)
+				input, exitCode, err = handleSh(cmdString)
 				if err != nil {
 					fmt.Fprintln(os.Stderr, err)
 				}
 				cmdFinish(exitCode, input, priv)
 			case "hybridRev":
-				_, _, err = handleSh(input)
+				_, _, err = handleSh(cmdString)
 				if err == nil {
 					cmdFinish(0, input, priv)
 					return
@@ -65,7 +65,7 @@ func runInput(input string, priv bool) {
 				}
 				cmdFinish(exitCode, input, priv)
 			case "sh":
-				input, exitCode, err = handleSh(input)
+				input, exitCode, err = handleSh(cmdString)
 				if err != nil {
 					fmt.Fprintln(os.Stderr, err)
 				}
@@ -220,11 +220,7 @@ func execHandle(bg bool) interp.ExecHandlerFunc {
 
 			// If alias was found, use command alias
 			argstring = aliases.Resolve(argstring)
-			var err error
+			args, _ = shell.Fields(argstring, nil)
-			args, err = shell.Fields(argstring, nil)
-			if err != nil {
-				return err
-			}
 		}
 
 		// If command is defined in Lua then run it

readline/codes.go

@@ -85,7 +85,6 @@ const (
 	seqBold       = "\x1b[1m"
 	seqUnderscore = "\x1b[4m"
 	seqBlink      = "\x1b[5m"
-	seqInvert     = "\x1b[7m"
 )
 
 // Text colours

readline/comp-grid.go

@@ -121,7 +121,7 @@ func (g *CompletionGroup) writeGrid(rl *Instance) (comp string) {
 		}
 
 		if (x == g.tcPosX && y == g.tcPosY) && (g.isCurrent) {
-			comp += seqInvert
+			comp += seqCtermFg255 + seqFgBlackBright
 		}
 
 		comp += fmt.Sprintf("%-"+cellWidth+"s %s", g.Suggestions[i], seqReset)

readline/comp-list.go

@@ -188,7 +188,7 @@ func (g *CompletionGroup) writeList(rl *Instance) (comp string) {
 	// function highlights the cell depending on current selector place.
 	highlight := func(y int, x int) string {
 		if y == g.tcPosY && x == g.tcPosX && g.isCurrent {
-			return seqInvert
+			return seqCtermFg255 + seqFgBlackBright
 		}
 		return ""
 	}

readline/comp-map.go

@@ -101,7 +101,7 @@ func (g *CompletionGroup) writeMap(rl *Instance) (comp string) {
 	// Highlighting function
 	highlight := func(y int) string {
 		if y == g.tcPosY && g.isCurrent {
-			return seqInvert
+			return seqCtermFg255 + seqFgBlackBright
 		}
 		return ""
 	}