From ec4cb7853557021904cc0e613ba973f23aeef7ab Mon Sep 17 00:00:00 2001 From: Gokcehan Date: Sun, 6 Nov 2016 18:09:18 +0300 Subject: [PATCH] rename paste command to put --- comp.go | 2 +- doc.go | 10 +++++----- docstring.go | 10 +++++----- eval.go | 6 +++--- nav.go | 2 +- opts.go | 2 +- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/comp.go b/comp.go index 186e99c..e746906 100644 --- a/comp.go +++ b/comp.go @@ -35,7 +35,7 @@ var ( "invert", "yank", "delete", - "paste", + "put", "renew", "echo", "cd", diff --git a/doc.go b/doc.go index 0fc8414..be5b6cd 100644 --- a/doc.go +++ b/doc.go @@ -33,7 +33,7 @@ The following commands are provided by lf with default keybindings. invert (default "v") yank (default "y") delete (default "d") - paste (default "p") + put (default "p") renew (default "") The following commands are provided by lf without default keybindings. @@ -181,11 +181,11 @@ File Operations lf uses the underlying "cp" and "mv" shell commands for file operations. For this purpose, when you "yank" (i.e. copy) a file, it doesn't actually copy the file on the disk, but only records its name to memory. The actual file -operation takes place when you do the "paste" in which case the "cp" command is +operation takes place when you do the "put" in which case the "cp" command is used. Similarly the "mv" command is used for "delete" (i.e. cut or kill) -followed by "paste". These traditional names (e.g. "yank" and "delete") are -picked instead of the other common convention (e.g. copy and cut) to resemble -the default keybinds for these operations. +followed by "put". These traditional names (e.g. "yank", "delete", and "put") +are picked instead of the other common convention (e.g. copy and cut) to +resemble the default keybinds for these operations. Opening Files diff --git a/docstring.go b/docstring.go index 11dad52..16d6c0f 100644 --- a/docstring.go +++ b/docstring.go @@ -37,7 +37,7 @@ The following commands are provided by lf with default keybindings. invert (default "v") yank (default "y") delete (default "d") - paste (default "p") + put (default "p") renew (default "") The following commands are provided by lf without default keybindings. @@ -194,11 +194,11 @@ File Operations lf uses the underlying "cp" and "mv" shell commands for file operations. For this purpose, when you "yank" (i.e. copy) a file, it doesn't actually copy the file on the disk, but only records its name to memory. The actual file -operation takes place when you do the "paste" in which case the "cp" command +operation takes place when you do the "put" in which case the "cp" command is used. Similarly the "mv" command is used for "delete" (i.e. cut or kill) -followed by "paste". These traditional names (e.g. "yank" and "delete") are -picked instead of the other common convention (e.g. copy and cut) to -resemble the default keybinds for these operations. +followed by "put". These traditional names (e.g. "yank", "delete", and +"put") are picked instead of the other common convention (e.g. copy and cut) +to resemble the default keybinds for these operations. Opening Files diff --git a/eval.go b/eval.go index f2a2927..e74fb76 100644 --- a/eval.go +++ b/eval.go @@ -309,9 +309,9 @@ func (e *CallExpr) eval(app *App, args []string) { app.ui.message = fmt.Sprintf("%d files saved for move", len(app.nav.marks)) } app.nav.marks = make(map[string]bool) - case "paste": - if err := app.nav.paste(); err != nil { - msg := fmt.Sprintf("paste: %s", err) + case "put": + if err := app.nav.put(); err != nil { + msg := fmt.Sprintf("put: %s", err) app.ui.message = msg log.Printf(msg) return diff --git a/nav.go b/nav.go index 5e9b9aa..f28075d 100644 --- a/nav.go +++ b/nav.go @@ -444,7 +444,7 @@ func (nav *Nav) save(keep bool) error { return nil } -func (nav *Nav) paste() error { +func (nav *Nav) put() error { list, keep, err := loadFiles() if err != nil { return err diff --git a/opts.go b/opts.go index 2615836..90a2bfe 100644 --- a/opts.go +++ b/opts.go @@ -54,7 +54,7 @@ func init() { gOpts.keys["v"] = &CallExpr{"invert", nil} gOpts.keys["y"] = &CallExpr{"yank", nil} gOpts.keys["d"] = &CallExpr{"delete", nil} - gOpts.keys["p"] = &CallExpr{"paste", nil} + gOpts.keys["p"] = &CallExpr{"put", nil} gOpts.keys[""] = &CallExpr{"renew", nil} gOpts.cmds = make(map[string]Expr)