Merge pull requests

This mainly merges gokcehan#924 with @laktak's
gokcehan#861. This also merges in the `:keys`
command (gokcehan#918) as well as 
and some unrelated minor corrections (currently
dd5dc59).

complete.go

@@ -77,6 +77,7 @@ var (
 		"mark-remove",
 		"tag",
 		"tag-toggle",
+		"keys",
 	}
 
 	gOptWords = []string{

doc.go

@@ -10,7 +10,7 @@ This documentation can either be read from terminal using 'lf -doc' or online at
 You can also use 'doc' command (default '<f-1>') inside lf to view the documentation in a pager.
 A man page with the same content is also available in the repository at https://github.com/gokcehan/lf/blob/master/lf.1
 
-You can run 'lf -help' to see descriptions of command line options.
+You can run 'lf -help' to see descriptions of command line options. The 'keys' command inside lf lists available key bindings.
 
 Quick Reference
 
@@ -78,6 +78,7 @@ The following commands are provided by lf:
     mark-remove    (modal)   (default '"')
     tag
     tag-toggle               (default 't')
+    keys
 
 The following command line commands are provided by lf:
 
@@ -208,6 +209,7 @@ The following additional keybindings are provided by default:
     map se :set sortby ext; set info
     map gh cd ~
     map <space> :toggle; down
+    map <f-1> :doc
 
 Configuration
 
@@ -471,6 +473,10 @@ You can define a new tag clearing command by combining 'tag' with 'tag-toggle' (
 
 Tag a file with '*' or a single width character given in the argument if the file is untagged, otherwise remove the tag.
 
+    keys
+
+List active key bindings in the pager.
+
 Command Line Commands
 
 This section shows information about command line commands.

eval.go

@@ -1474,6 +1474,25 @@ func (e *callExpr) eval(app *app, args []string) {
 		app.ui.echomsg(strings.Join(e.args, " "))
 	case "echoerr":
 		app.ui.echoerr(strings.Join(e.args, " "))
+	case "keys":
+		tempfile, err := os.CreateTemp("", "lf_bindings")
+		if err != nil {
+			app.ui.echoerrf("keys: %s:", err)
+			return
+		}
+		_, err = tempfile.Write(listBinds(gOpts.keys).Bytes())
+		tempfile.Close()
+
+		filename := tempfile.Name()
+		if err == nil {
+			app.runShell(pageFileCommand(filename), e.args, "$")
+		}
+
+		os.Remove(filename)
+		app.ui.loadFile(app.nav, false)
+		if err != nil {
+			app.ui.echoerrf("keys: %s:", err)
+		}
 	case "cd":
 		path := "~"
 		if len(e.args) > 0 {

lf.1

@@ -26,7 +26,7 @@ Source code can be found in the repository at https://github.com/gokcehan/lf
 .PP
 This documentation can either be read from terminal using 'lf -doc' or online at https://pkg.go.dev/github.com/gokcehan/lf You can also use 'doc' command (default '<f-1>') inside lf to view the documentation in a pager. A man page with the same content is also available in the repository at https://github.com/gokcehan/lf/blob/master/lf.1
 .PP
-You can run 'lf -help' to see descriptions of command line options.
+You can run 'lf -help' to see descriptions of command line options. The 'keys' command inside lf lists available key bindings.
 .SH QUICK REFERENCE
 The following commands are provided by lf:
 .PP
@@ -93,6 +93,7 @@ The following commands are provided by lf:
     mark-remove    (modal)   (default '"')
     tag
     tag-toggle               (default 't')
+    keys
 .EE
 .PP
 The following command line commands are provided by lf:
@@ -235,6 +236,7 @@ The following additional keybindings are provided by default:
     map se :set sortby ext; set info
     map gh cd ~
     map <space> :toggle; down
+    map <f-1> :doc
 .EE
 .SH CONFIGURATION
 Configuration files should be located at:
@@ -578,6 +580,12 @@ Tag a file with '*' or a single width character given in the argument. You can d
 .EE
 .PP
 Tag a file with '*' or a single width character given in the argument if the file is untagged, otherwise remove the tag.
+.PP
+.EX
+    keys
+.EE
+.PP
+List active key bindings in the pager.
 .SH COMMAND LINE COMMANDS
 This section shows information about command line commands. These should be mostly compatible with readline keybindings. A character refers to a unicode code point, a word consists of letters and digits, and a unix word consists of any non-blank characters.
 .PP

nav.go

@@ -1353,14 +1353,17 @@ func (nav *nav) sync() error {
 	}
 
 	oldmarks := nav.marks
-	err = nav.readMarks()
+	errMarks := nav.readMarks()
 	for _, ch := range gOpts.tempmarks {
 		tmp := string(ch)
 		if v, e := oldmarks[tmp]; e {
 			nav.marks[tmp] = v
 		}
 	}
 	err = nav.readTags()
+	if errMarks != nil {
+		return errMarks
+	}
 	return err
 }
 

os.go

@@ -146,10 +146,14 @@ func shellKill(cmd *exec.Cmd) error {
 	return cmd.Process.Kill()
 }
 
+func pageFileCommand(filename string) string {
+	return fmt.Sprintf(`$PAGER "%s"`, filename)
+}
+
 func setDefaults() {
 	gOpts.cmds["open"] = &execExpr{"&", `$OPENER "$f"`}
 	gOpts.keys["e"] = &execExpr{"$", `$EDITOR "$f"`}
-	gOpts.keys["i"] = &execExpr{"$", `$PAGER "$f"`}
+	gOpts.keys["i"] = &execExpr{"$", pageFileCommand(`$f`)}
 	gOpts.keys["w"] = &execExpr{"$", "$SHELL"}
 
 	gOpts.cmds["doc"] = &execExpr{"$", "lf -doc | $PAGER"}

os_windows.go

@@ -109,10 +109,14 @@ func shellKill(cmd *exec.Cmd) error {
 	return cmd.Process.Kill()
 }
 
+func pageFileCommand(filename string) string {
+	return fmt.Sprintf(`%PAGER% "%s"`, filename)
+}
+
 func setDefaults() {
 	gOpts.cmds["open"] = &execExpr{"&", "%OPENER% %f%"}
 	gOpts.keys["e"] = &execExpr{"$", "%EDITOR% %f%"}
-	gOpts.keys["i"] = &execExpr{"!", "%PAGER% %f%"}
+	gOpts.keys["i"] = &execExpr{"!", pageFileCommand("%f%")}
 	gOpts.keys["w"] = &execExpr{"$", "%SHELL%"}
 
 	gOpts.cmds["doc"] = &execExpr{"!", "lf -doc | %PAGER%"}

server.go

@@ -61,7 +61,7 @@ func listen(l net.Listener) {
 
 func echoerr(c net.Conn, msg string) {
 	fmt.Fprintln(c, msg)
-	log.Printf(msg)
+	log.Print(msg)
 }
 
 func echoerrf(c net.Conn, format string, a ...interface{}) {