From 3e3aeead9bdb585ac6f47a2eb7560526fc795b05 Mon Sep 17 00:00:00 2001 From: "Dirk-Jan C. Binnema" Date: Fri, 30 Dec 2022 16:19:19 +0200 Subject: [PATCH] Revert "Add support for empty and string maildir shortcuts" This reverts commit be695579c62a0a759bc77e6361554d5ce0025cc6. The change didn't look very nice (keynames are not aligned etc.), and in hindsight we should probably implement this slightly differently. --- mu4e/mu4e-folders.el | 5 ++--- mu4e/mu4e-main.el | 2 +- mu4e/mu4e.texi | 6 ++---- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/mu4e/mu4e-folders.el b/mu4e/mu4e-folders.el index 888d69b8..032e0cf0 100644 --- a/mu4e/mu4e-folders.el +++ b/mu4e/mu4e-folders.el @@ -92,12 +92,11 @@ This makes it possible to quickly go to a particular maildir (folder), or quickly moving messages to them (e.g., for archiving or refiling). -Each of the list elements is a plist with at least a +Each of the list elements is a plist with at least: `:maildir' - the maildir for the shortcut (e.g. \"/archive\") +`:key' - the shortcut key. Optionally, you can add the following: -`:key' - the shortcut key, can also be a string that gets -displayed in the main view. `:name' - name of the maildir to be displayed in main-view. `:hide' - if t, the shortcut is hidden from the main-view and speedbar. diff --git a/mu4e/mu4e-main.el b/mu4e/mu4e-main.el index 4e7e08e2..637d9cdf 100644 --- a/mu4e/mu4e-main.el +++ b/mu4e/mu4e-main.el @@ -210,7 +210,7 @@ clicked." with longest = (mu4e--longest-of-maildirs-and-bookmarks) with queries = (plist-get mu4e--server-props :queries) for m in mds - for key = (plist-get m :key) + for key = (string (plist-get m :key)) for name = (plist-get m :name) for query = (plist-get m :query) for qcounts = (and (stringp query) diff --git a/mu4e/mu4e.texi b/mu4e/mu4e.texi index fca0f199..15f38dc2 100644 --- a/mu4e/mu4e.texi +++ b/mu4e/mu4e.texi @@ -2015,8 +2015,7 @@ quick access to, for example: (:maildir "/lists" :key ?l) (:maildir "/work" :key ?w) (:maildir "/sent" :key ?s) - (:maildir "/lists/project_a/list_b" :key "Lab") - (:maildir "/lists/project_c/list_x" :key ?x :name "Project X"))) + (:maildir "/lists/project/project_X" :key ?x :name "Project X"))) @end lisp This sets @key{i} as a shortcut for the @t{/inbox} folder --- effectively a @@ -2026,8 +2025,7 @@ choose from @emph{all} maildirs that you have. There is support for autocompletion; note that the list of maildirs is determined when @t{mu4e} starts; if there are changes in the maildirs while @t{mu4e} is running, you need to restart @t{mu4e}. Optionally, you can specify a name to be displayed -in the main view. The key can also be a string, in that case the string gets -displayed in the main view. This is useful e.g. for calling custom Hydras. +in the main view. Each of the folder names is relative to your top-level maildir directory; so if you keep your mail in @file{~/Maildir}, @file{/inbox} would refer to