Joining the args in cf for folders with spaces

This commit is contained in:
Ben Cohen 2019-08-08 14:39:33 -04:00 committed by Drew DeVault
parent f6df46d319
commit 4d95676274

View file

@ -2,6 +2,7 @@ package account
import ( import (
"errors" "errors"
"strings"
"git.sr.ht/~sircmpwn/aerc/commands" "git.sr.ht/~sircmpwn/aerc/commands"
"git.sr.ht/~sircmpwn/aerc/widgets" "git.sr.ht/~sircmpwn/aerc/widgets"
@ -27,7 +28,7 @@ func (_ ChangeFolder) Complete(aerc *widgets.Aerc, args []string) []string {
} }
func (_ ChangeFolder) Execute(aerc *widgets.Aerc, args []string) error { func (_ ChangeFolder) Execute(aerc *widgets.Aerc, args []string) error {
if len(args) != 2 { if len(args) < 2 {
return errors.New("Usage: cf <folder>") return errors.New("Usage: cf <folder>")
} }
acct := aerc.SelectedAccount() acct := aerc.SelectedAccount()
@ -42,6 +43,9 @@ func (_ ChangeFolder) Execute(aerc *widgets.Aerc, args []string) error {
return errors.New("No previous folder to return to") return errors.New("No previous folder to return to")
} }
} else { } else {
if len(args) > 2 {
args[1] = strings.Join(args[1:], " ")
}
acct.Directories().Select(args[1]) acct.Directories().Select(args[1])
} }
history[acct.Name()] = previous history[acct.Name()] = previous