10 files changed, 30 insertions, 30 deletions

diff --git a/commands/account/cf.go b/commands/account/cf.go
index f318374e..cbef308e 100644
--- a/commands/account/cf.go
+++ b/commands/account/cf.go
@@ -19,15 +19,15 @@ func init() {
 	register(ChangeFolder{})
 }
 
-func (_ ChangeFolder) Aliases() []string {
+func (ChangeFolder) Aliases() []string {
 	return []string{"cf"}
 }
 
-func (_ ChangeFolder) Complete(aerc *widgets.Aerc, args []string) []string {
+func (ChangeFolder) Complete(aerc *widgets.Aerc, args []string) []string {
 	return commands.GetFolders(aerc, args)
 }
 
-func (_ ChangeFolder) Execute(aerc *widgets.Aerc, args []string) error {
+func (ChangeFolder) Execute(aerc *widgets.Aerc, args []string) error {
 	if len(args) < 2 {
 		return errors.New("Usage: cf <folder>")
 	}
diff --git a/commands/account/clear.go b/commands/account/clear.go
index bb9c04e4..392fdd0b 100644
--- a/commands/account/clear.go
+++ b/commands/account/clear.go
@@ -11,15 +11,15 @@ func init() {
 	register(Clear{})
 }
 
-func (_ Clear) Aliases() []string {
+func (Clear) Aliases() []string {
 	return []string{"clear"}
 }
 
-func (_ Clear) Complete(aerc *widgets.Aerc, args []string) []string {
+func (Clear) Complete(aerc *widgets.Aerc, args []string) []string {
 	return nil
 }
 
-func (_ Clear) Execute(aerc *widgets.Aerc, args []string) error {
+func (Clear) Execute(aerc *widgets.Aerc, args []string) error {
 	acct := aerc.SelectedAccount()
 	if acct == nil {
 		return errors.New("No account selected")
diff --git a/commands/account/compose.go b/commands/account/compose.go
index a4836b79..e61b593d 100644
--- a/commands/account/compose.go
+++ b/commands/account/compose.go
@@ -15,15 +15,15 @@ func init() {
 	register(Compose{})
 }
 
-func (_ Compose) Aliases() []string {
+func (Compose) Aliases() []string {
 	return []string{"compose"}
 }
 
-func (_ Compose) Complete(aerc *widgets.Aerc, args []string) []string {
+func (Compose) Complete(aerc *widgets.Aerc, args []string) []string {
 	return nil
 }
 
-func (_ Compose) Execute(aerc *widgets.Aerc, args []string) error {
+func (Compose) Execute(aerc *widgets.Aerc, args []string) error {
 	body, err := buildBody(args)
 	if err != nil {
 		return err
diff --git a/commands/account/mkdir.go b/commands/account/mkdir.go
index be9b14a3..d42928e3 100644
--- a/commands/account/mkdir.go
+++ b/commands/account/mkdir.go
@@ -16,15 +16,15 @@ func init() {
 	register(MakeDir{})
 }
 
-func (_ MakeDir) Aliases() []string {
+func (MakeDir) Aliases() []string {
 	return []string{"mkdir"}
 }
 
-func (_ MakeDir) Complete(aerc *widgets.Aerc, args []string) []string {
+func (MakeDir) Complete(aerc *widgets.Aerc, args []string) []string {
 	return nil
 }
 
-func (_ MakeDir) Execute(aerc *widgets.Aerc, args []string) error {
+func (MakeDir) Execute(aerc *widgets.Aerc, args []string) error {
 	if len(args) != 2 {
 		return errors.New("Usage: :mkdir <name>")
 	}
diff --git a/commands/account/next-folder.go b/commands/account/next-folder.go
index 537a3512..6a22772c 100644
--- a/commands/account/next-folder.go
+++ b/commands/account/next-folder.go
@@ -14,15 +14,15 @@ func init() {
 	register(NextPrevFolder{})
 }
 
-func (_ NextPrevFolder) Aliases() []string {
+func (NextPrevFolder) Aliases() []string {
 	return []string{"next-folder", "prev-folder"}
 }
 
-func (_ NextPrevFolder) Complete(aerc *widgets.Aerc, args []string) []string {
+func (NextPrevFolder) Complete(aerc *widgets.Aerc, args []string) []string {
 	return nil
 }
 
-func (_ NextPrevFolder) Execute(aerc *widgets.Aerc, args []string) error {
+func (NextPrevFolder) Execute(aerc *widgets.Aerc, args []string) error {
 	if len(args) > 2 {
 		return nextPrevFolderUsage(args[0])
 	}
diff --git a/commands/account/next-result.go b/commands/account/next-result.go
index 24d53be7..ab050af3 100644
--- a/commands/account/next-result.go
+++ b/commands/account/next-result.go
@@ -13,15 +13,15 @@ func init() {
 	register(NextPrevResult{})
 }
 
-func (_ NextPrevResult) Aliases() []string {
+func (NextPrevResult) Aliases() []string {
 	return []string{"next-result", "prev-result"}
 }
 
-func (_ NextPrevResult) Complete(aerc *widgets.Aerc, args []string) []string {
+func (NextPrevResult) Complete(aerc *widgets.Aerc, args []string) []string {
 	return nil
 }
 
-func (_ NextPrevResult) Execute(aerc *widgets.Aerc, args []string) error {
+func (NextPrevResult) Execute(aerc *widgets.Aerc, args []string) error {
 	if len(args) > 1 {
 		return nextPrevResultUsage(args[0])
 	}
diff --git a/commands/account/next.go b/commands/account/next.go
index 1ba4b1b6..604dcd7c 100644
--- a/commands/account/next.go
+++ b/commands/account/next.go
@@ -15,16 +15,16 @@ func init() {
 	register(NextPrevMsg{})
 }
 
-func (_ NextPrevMsg) Aliases() []string {
+func (NextPrevMsg) Aliases() []string {
 	return []string{"next", "next-message", "prev", "prev-message"}
 }
 
-func (_ NextPrevMsg) Complete(aerc *widgets.Aerc, args []string) []string {
+func (NextPrevMsg) Complete(aerc *widgets.Aerc, args []string) []string {
 	return nil
 }
 
-func (_ NextPrevMsg) Execute(aerc *widgets.Aerc, args []string) error {
 	var err, n, pct = ParseNextPrevMessage(args)
+func (NextPrevMsg) Execute(aerc *widgets.Aerc, args []string) error {
 	if err != nil {
 		return err
 	}
diff --git a/commands/account/search.go b/commands/account/search.go
index ca519173..1d2e7a2b 100644
--- a/commands/account/search.go
+++ b/commands/account/search.go
@@ -12,15 +12,15 @@ func init() {
 	register(SearchFilter{})
 }
 
-func (_ SearchFilter) Aliases() []string {
+func (SearchFilter) Aliases() []string {
 	return []string{"search", "filter"}
 }
 
-func (_ SearchFilter) Complete(aerc *widgets.Aerc, args []string) []string {
+func (SearchFilter) Complete(aerc *widgets.Aerc, args []string) []string {
 	return nil
 }
 
-func (_ SearchFilter) Execute(aerc *widgets.Aerc, args []string) error {
+func (SearchFilter) Execute(aerc *widgets.Aerc, args []string) error {
 	acct := aerc.SelectedAccount()
 	if acct == nil {
 		return errors.New("No account selected")
diff --git a/commands/account/select.go b/commands/account/select.go
index 70e08ac6..b41b2346 100644
--- a/commands/account/select.go
+++ b/commands/account/select.go
@@ -13,15 +13,15 @@ func init() {
 	register(SelectMessage{})
 }
 
-func (_ SelectMessage) Aliases() []string {
+func (SelectMessage) Aliases() []string {
 	return []string{"select", "select-message"}
 }
 
-func (_ SelectMessage) Complete(aerc *widgets.Aerc, args []string) []string {
+func (SelectMessage) Complete(aerc *widgets.Aerc, args []string) []string {
 	return nil
 }
 
-func (_ SelectMessage) Execute(aerc *widgets.Aerc, args []string) error {
+func (SelectMessage) Execute(aerc *widgets.Aerc, args []string) error {
 	if len(args) != 2 {
 		return errors.New("Usage: :select-message <n>")
 	}
diff --git a/commands/account/view.go b/commands/account/view.go
index cec65aa9..af393605 100644
--- a/commands/account/view.go
+++ b/commands/account/view.go
@@ -12,15 +12,15 @@ func init() {
 	register(ViewMessage{})
 }
 
-func (_ ViewMessage) Aliases() []string {
+func (ViewMessage) Aliases() []string {
 	return []string{"view-message", "view"}
 }
 
-func (_ ViewMessage) Complete(aerc *widgets.Aerc, args []string) []string {
+func (ViewMessage) Complete(aerc *widgets.Aerc, args []string) []string {
 	return nil
 }
 
-func (_ ViewMessage) Execute(aerc *widgets.Aerc, args []string) error {
+func (ViewMessage) Execute(aerc *widgets.Aerc, args []string) error {
 	if len(args) != 1 {
 		return errors.New("Usage: view-message")
 	}