diff options
Diffstat (limited to 'commands/msg')
-rw-r--r-- | commands/msg/copy.go | 3 | ||||
-rw-r--r-- | commands/msg/mark.go | 14 | ||||
-rw-r--r-- | commands/msg/move.go | 3 | ||||
-rw-r--r-- | commands/msg/read.go | 7 | ||||
-rw-r--r-- | commands/msg/recall.go | 3 |
5 files changed, 15 insertions, 15 deletions
diff --git a/commands/msg/copy.go b/commands/msg/copy.go index 44257a74..6a106cf8 100644 --- a/commands/msg/copy.go +++ b/commands/msg/copy.go @@ -36,8 +36,7 @@ func (Copy) Execute(aerc *widgets.Aerc, args []string) error { } var createParents bool for _, opt := range opts { - switch opt.Option { - case 'p': + if opt.Option == 'p' { createParents = true } } diff --git a/commands/msg/mark.go b/commands/msg/mark.go index c446fc62..e15a9f6e 100644 --- a/commands/msg/mark.go +++ b/commands/msg/mark.go @@ -61,16 +61,17 @@ func (Mark) Execute(aerc *widgets.Aerc, args []string) error { } else { modFunc = store.Mark } - if all { + switch { + case all: uids := store.Uids() for _, uid := range uids { modFunc(uid) } return nil - } else if visual { + case visual: store.ToggleVisualMark() return nil - } else { + default: modFunc(selected.Uid) return nil } @@ -80,16 +81,17 @@ func (Mark) Execute(aerc *widgets.Aerc, args []string) error { return fmt.Errorf("visual mode not supported for this command") } - if all && toggle { + switch { + case all && toggle: uids := store.Uids() for _, uid := range uids { store.ToggleMark(uid) } return nil - } else if all && !toggle { + case all && !toggle: store.ClearVisualMark() return nil - } else { + default: store.Unmark(selected.Uid) return nil } diff --git a/commands/msg/move.go b/commands/msg/move.go index 2e3d4385..6eca6675 100644 --- a/commands/msg/move.go +++ b/commands/msg/move.go @@ -36,8 +36,7 @@ func (Move) Execute(aerc *widgets.Aerc, args []string) error { } var createParents bool for _, opt := range opts { - switch opt.Option { - case 'p': + if opt.Option == 'p' { createParents = true } } diff --git a/commands/msg/read.go b/commands/msg/read.go index 4c169b3b..e4d091f7 100644 --- a/commands/msg/read.go +++ b/commands/msg/read.go @@ -102,11 +102,12 @@ func (FlagMsg) Execute(aerc *widgets.Aerc, args []string) error { flagChosen = true } } - if toggle { + switch { + case toggle: actionName = "Toggling" - } else if enable { + case enable: actionName = "Setting" - } else { + default: actionName = "Unsetting" } if optind != len(args) { diff --git a/commands/msg/recall.go b/commands/msg/recall.go index 8434b8d8..5fc3a265 100644 --- a/commands/msg/recall.go +++ b/commands/msg/recall.go @@ -42,8 +42,7 @@ func (Recall) Execute(aerc *widgets.Aerc, args []string) error { return err } for _, opt := range opts { - switch opt.Option { - case 'f': + if opt.Option == 'f' { force = true } } |