diff options
Diffstat (limited to 'commands')
-rw-r--r-- | commands/account/clear.go | 25 | ||||
-rw-r--r-- | commands/msg/toggle-threads.go | 1 |
2 files changed, 26 insertions, 0 deletions
diff --git a/commands/account/clear.go b/commands/account/clear.go index 64e70122..69fac2dc 100644 --- a/commands/account/clear.go +++ b/commands/account/clear.go @@ -5,6 +5,7 @@ import ( "git.sr.ht/~rjarry/aerc/lib/statusline" "git.sr.ht/~rjarry/aerc/widgets" + "git.sr.ht/~sircmpwn/getopt" ) type Clear struct{} @@ -30,6 +31,30 @@ func (Clear) Execute(aerc *widgets.Aerc, args []string) error { if store == nil { return errors.New("Cannot perform action. Messages still loading") } + + clearSelected := false + opts, optind, err := getopt.Getopts(args, "s") + if err != nil { + return err + } + + for _, opt := range opts { + switch opt.Option { + case 's': + clearSelected = true + } + } + + if len(args) != optind { + return errors.New("Usage: clear [-s]") + } + + if clearSelected { + defer store.Select(0) + } else { + defer store.Reselect(store.Selected()) + } + store.ApplyClear() acct.SetStatus(statusline.SearchFilterClear()) diff --git a/commands/msg/toggle-threads.go b/commands/msg/toggle-threads.go index 79d515cb..ac4242b8 100644 --- a/commands/msg/toggle-threads.go +++ b/commands/msg/toggle-threads.go @@ -34,6 +34,7 @@ func (ToggleThreads) Execute(aerc *widgets.Aerc, args []string) error { if err != nil { return err } + defer store.Reselect(store.Selected()) store.SetBuildThreads(!store.BuildThreads()) acct.SetStatus(statusline.Threading(store.BuildThreads())) acct.Messages().Invalidate() |