Clean up some Muttrc macros, and add macro 'y' to jump to the mailboxes

view. Closes: #2069.

diff --git a/Muttrc.head.in b/Muttrc.head.in
index 081daf5690f188b37efcd0551f2d45f3b49f9aa8..44ec4d2c165b4bbe3a0d867e8158782f13d2372a 100644 (file)
--- a/Muttrc.head.in
+++ b/Muttrc.head.in
@@ -8,16 +8,17 @@ ignore "from " received content- mime-version status x-status message-id
 ignore sender references return-path lines
 
 # imitate the old search-body function
-macro index \eb '/~b ' 'search in message bodies'
+macro index \eb "<search>~b " "search in message bodies"
 
 # simulate the old url menu
-macro index \cb |urlview\n 'call urlview to extract URLs out of a message'
-macro pager \cb |urlview\n 'call urlview to extract URLs out of a message'
+macro index,pager \cb "<pipe-message>urlview<Enter>" "call urlview to extract URLs out of a message"
 
 # Show documentation when pressing F1
-macro generic <f1> "!less @docdir@/manual.txt\n" "Show Mutt documentation"
-macro index   <f1> "!less @docdir@/manual.txt\n" "Show Mutt documentation"
-macro pager   <f1> "!less @docdir@/manual.txt\n" "Show Mutt documentation"
+macro generic,pager <F1> "<shell-escape>less @docdir@/manual.txt<Enter>" "show Mutt documentation"
+
+# show the incoming mailboxes list (just like "mutt -y") and back when pressing "y"
+macro index,pager y "<change-folder>?<toggle-mailboxes>" "show incoming mailboxes list"
+bind browser y exit
 
 # If Mutt is unable to determine your site's domain name correctly, you can
 # set the default here.