diff options
| author | Koni Marti <koni.marti@gmail.com> | 2023-11-24 16:03:03 +0100 |
|---|---|---|
| committer | Robin Jarry <robin@jarry.cc> | 2023-12-30 15:42:09 +0100 |
| commit | cf47763e5582563f712b4a40a9b299378aba9003 (patch) | |
| tree | af83b863a644a90a69eef891a4ce06023224a213 /app | |
| parent | fdd9f7991aa50bd99d21c178a2816fc075eead6b (diff) | |
| download | aerc-cf47763e5582563f712b4a40a9b299378aba9003.tar.gz | |
patch/list: add list sub-cmd
Implement the :patch list command. List the the current project and add
a flag to list all saved projects. Use the pager to display the data and
extract the pager commands and move them into the config package.
Signed-off-by: Koni Marti <koni.marti@gmail.com>
Acked-by: Robin Jarry <robin@jarry.cc>
Diffstat (limited to 'app')
| -rw-r--r-- | app/aerc.go | 10 | ||||
| -rw-r--r-- | app/compose.go | 8 | ||||
| -rw-r--r-- | app/msgviewer.go | 7 |
3 files changed, 8 insertions, 17 deletions
diff --git a/app/aerc.go b/app/aerc.go index 046c7871..c7307540 100644 --- a/app/aerc.go +++ b/app/aerc.go @@ -873,9 +873,9 @@ func (aerc *Aerc) isExKey(event *tcell.EventKey, exKey config.KeyStroke) bool { return event.Modifiers() == exKey.Modifiers && event.Key() == exKey.Key } -// cmdFallbackSearch checks cmds for the first executable availabe in PATH. An error is +// CmdFallbackSearch checks cmds for the first executable availabe in PATH. An error is // returned if none are found -func cmdFallbackSearch(cmds []string) (string, error) { +func CmdFallbackSearch(cmds []string, silent bool) (string, error) { var tried []string for _, cmd := range cmds { if cmd == "" { @@ -885,8 +885,10 @@ func cmdFallbackSearch(cmds []string) (string, error) { _, err := exec.LookPath(params[0]) if err != nil { tried = append(tried, cmd) - warn := fmt.Sprintf("cmd '%s' not found in PATH, using fallback", cmd) - PushWarning(warn) + if !silent { + warn := fmt.Sprintf("cmd '%s' not found in PATH, using fallback", cmd) + PushWarning(warn) + } continue } return cmd, nil diff --git a/app/compose.go b/app/compose.go index 75f90f12..35fdd9bf 100644 --- a/app/compose.go +++ b/app/compose.go @@ -1320,13 +1320,7 @@ func (c *Composer) showTerminal() error { if c.editor != nil { c.editor.Destroy() } - cmds := []string{ - config.Compose.Editor, - os.Getenv("EDITOR"), - "vi", - "nano", - } - editorName, err := cmdFallbackSearch(cmds) + editorName, err := CmdFallbackSearch(config.EditorCmds(), false) if err != nil { c.acct.PushError(fmt.Errorf("could not start editor: %w", err)) } diff --git a/app/msgviewer.go b/app/msgviewer.go index abed93fd..e45a6d3e 100644 --- a/app/msgviewer.go +++ b/app/msgviewer.go @@ -421,12 +421,7 @@ func NewPartViewer( pagerin io.WriteCloser term *Terminal ) - cmds := []string{ - config.Viewer.Pager, - os.Getenv("PAGER"), - "less -Rc", - } - pagerCmd, err := cmdFallbackSearch(cmds) + pagerCmd, err := CmdFallbackSearch(config.PagerCmds(), false) if err != nil { acct.PushError(fmt.Errorf("could not start pager: %w", err)) return nil, err |