2 files changed, 38 insertions, 4 deletions
diff --git a/commands/cd.go b/commands/cd.go
new file mode 100644
index 00000000..e3a19536
--- /dev/null
+++ b/commands/cd.go
@@ -0,0 +1,35 @@
+package commands
+
+import (
+	"errors"
+
+	"git.sr.ht/~sircmpwn/aerc2/widgets"
+)
+
+var (
+	history map[string]string
+)
+
+func init() {
+	history = make(map[string]string)
+	Register("cd", ChangeDirectory)
+}
+
+func ChangeDirectory(aerc *widgets.Aerc, args []string) error {
+	if len(args) != 2 {
+		return errors.New("Usage: cd <directory>")
+	}
+	acct := aerc.SelectedAccount()
+	previous := acct.Directories().Selected()
+	if args[1] == "-" {
+		if dir, ok := history[acct.Name()]; ok {
+			acct.Directories().Select(dir)
+		} else {
+			return errors.New("No previous directory to return to")
+		}
+	} else {
+		acct.Directories().Select(args[1])
+	}
+	history[acct.Name()] = previous
+	return nil
+}
diff --git a/commands/commands.go b/commands/commands.go
index 49a8b46e..2890cdd4 100644
--- a/commands/commands.go
+++ b/commands/commands.go
@@ -14,11 +14,10 @@ var (
 	commands map[string]AercCommand
 )
 
-func init() {
-	commands = make(map[string]AercCommand)
-}
-
 func Register(name string, cmd AercCommand) {
+	if commands == nil {
+		commands = make(map[string]AercCommand)
+	}
 	commands[name] = cmd
 }