Merge branch 'gokcehan:master' into sixel

app.go

@@ -59,8 +59,10 @@ func newApp(ui *ui, nav *nav) *app {
 }
 
 func (app *app) quit() {
-	if err := app.writeHistory(); err != nil {
-		log.Printf("writing history file: %s", err)
+	if gOpts.history {
+		if err := app.writeHistory(); err != nil {
+			log.Printf("writing history file: %s", err)
+		}
 	}
 	if !gSingleMode {
 		if err := remote(fmt.Sprintf("drop %d", gClientID)); err != nil {

doc.go

@@ -124,6 +124,7 @@ The following options can be used to customize the behavior of lf:
     globsearch     bool      (default off)
     hidden         bool      (default off)
     hiddenfiles    []string  (default '.*')
+    history        bool      (default on)
     icons          bool      (default off)
     ifs            string    (default '')
     ignorecase     bool      (default on)
@@ -708,7 +709,7 @@ Preview filtering is disabled and files are displayed as they are when the value
     promptfmt      string    (default "\033[32;1m%u@%h\033[0m:\033[34;1m%d\033[0m\033[1m%f\033[0m")
 
 Format string of the prompt shown in the top line.
-Special expansions are provided, '%u' as the user name, '%h' as the host name, '%w' as the working directory, '%d' as the working directory with a trailing path separator, '%f' as the file name, and '%F' as the current filter.
+Special expansions are provided, '%u' as the user name, '%h' as the host name, '%w' as the working directory, '%d' as the working directory with a trailing path separator, '%f' as the file name, and '%F' as the current filter. '%S' may be used once and will provide a spacer so that the following parts are right aligned on the screen.
 Home folder is shown as '~' in the working directory expansion.
 Directory names are automatically shortened to a single character starting from the left most parent when the prompt does not fit to the screen.
 

eval.go

@@ -125,6 +125,12 @@ func (e *setExpr) eval(app *app, args []string) {
 		app.nav.position()
 		app.ui.sort()
 		app.ui.loadFile(app.nav, true)
+	case "history":
+		gOpts.history = true
+	case "nohistory":
+		gOpts.history = false
+	case "history!":
+		gOpts.history = !gOpts.history
 	case "icons":
 		gOpts.icons = true
 	case "noicons":
@@ -1917,6 +1923,7 @@ func (e *callExpr) eval(app *app, args []string) {
 		update(app)
 	case "cmd-delete-back":
 		if len(app.ui.cmdAccLeft) == 0 {
+			normal(app)
 			return
 		}
 		app.ui.cmdAccLeft = app.ui.cmdAccLeft[:len(app.ui.cmdAccLeft)-1]

lf.1

@@ -143,6 +143,7 @@ The following options can be used to customize the behavior of lf:
     globsearch     bool      (default off)
     hidden         bool      (default off)
     hiddenfiles    []string  (default '.*')
+    history        bool      (default on)
     icons          bool      (default off)
     ifs            string    (default '')
     ignorecase     bool      (default on)
@@ -860,7 +861,7 @@ Set the path of a previewer file to filter the content of regular files for prev
     promptfmt      string    (default "\e033[32;1m%u@%h\e033[0m:\e033[34;1m%d\e033[0m\e033[1m%f\e033[0m")
 .EE
 .PP
-Format string of the prompt shown in the top line. Special expansions are provided, '%u' as the user name, '%h' as the host name, '%w' as the working directory, '%d' as the working directory with a trailing path separator, '%f' as the file name, and '%F' as the current filter. Home folder is shown as '~' in the working directory expansion. Directory names are automatically shortened to a single character starting from the left most parent when the prompt does not fit to the screen.
+Format string of the prompt shown in the top line. Special expansions are provided, '%u' as the user name, '%h' as the host name, '%w' as the working directory, '%d' as the working directory with a trailing path separator, '%f' as the file name, and '%F' as the current filter. '%S' may be used once and will provide a spacer so that the following parts are right aligned on the screen. Home folder is shown as '~' in the working directory expansion. Directory names are automatically shortened to a single character starting from the left most parent when the prompt does not fit to the screen.
 .PP
 .EX
     ratios         []int     (default '1:2:3')

nav.go

@@ -1745,9 +1745,12 @@ func (nav *nav) readTags() error {
 
 	scanner := bufio.NewScanner(f)
 	for scanner.Scan() {
-		toks := strings.SplitN(scanner.Text(), ":", 2)
-		if _, ok := nav.tags[toks[0]]; !ok {
-			nav.tags[toks[0]] = toks[1]
+		text := scanner.Text()
+		ind := strings.LastIndex(text, ":")
+		path := text[0:ind]
+		mark := text[ind+1:]
+		if _, ok := nav.tags[path]; !ok {
+			nav.tags[path] = mark
 		}
 	}
 

opts.go

@@ -67,6 +67,7 @@ var gOpts struct {
 	truncatechar   string
 	ratios         []int
 	hiddenfiles    []string
+	history        bool
 	info           []string
 	shellopts      []string
 	keys           map[string]expr
@@ -117,6 +118,7 @@ func init() {
 	gOpts.truncatechar = "~"
 	gOpts.ratios = []int{1, 2, 3}
 	gOpts.hiddenfiles = []string{".*"}
+	gOpts.history = true
 	gOpts.info = nil
 	gOpts.shellopts = nil
 	gOpts.sortType = sortType{naturalSort, dirfirstSort}

ui.go

@@ -757,6 +757,13 @@ func (ui *ui) drawPromptLine(nav *nav) {
 		prompt = strings.Replace(prompt, "%F", "", -1)
 	}
 
+	// spacer
+	avail := ui.promptWin.w - printLength(prompt) + 2
+	if avail > 0 {
+		prompt = strings.Replace(prompt, "%S", strings.Repeat(" ", avail), 1)
+	}
+	prompt = strings.Replace(prompt, "%S", "", -1)
+
 	ui.promptWin.print(ui.screen, 0, 0, st, prompt)
 }