.muttrc: avoid <Enter><exit>

[dotfiles.git] / .muttrc

diff --git a/.muttrc b/.muttrc
index 14649aaa2f5c8a29a5911604d469e40e4ee6dac3..fad17a91daef8f095222b552d718764b8702fa29 100644 (file)
--- a/.muttrc
+++ b/.muttrc
@@ -283,41 +283,83 @@ bind index,pager <Esc>S decode-save
 # Macros
 #
 
-# Go to the first folder with unread messages
-macro index,pager C <Enter><exit><Home><change-folder><Enter>
-
-# Move current message to inbox
-macro index,pager S <save-message>!<Enter>
-
-macro index,pager <Esc>h ":auto_view text/html<Enter>"
-macro index,pager <Esc>H ":unauto_view text/html<Enter>"
-
-# Pipe spam
-macro index,pager <Esc>s <Enter><exit> \
-   "<pipe-message>spamassassin -d | ~/mail/bin/spamcop.py<Enter> \
-   <next-undeleted>"
-macro index,pager <Esc>z \
-   "<Enter><exit>:set editor='vim -s ~/mail/misc/spamcop.vim'<Enter> \
-   r:set editor=vim.sh<Enter><exit><next-undeleted>"
-
-# Go to main mailboxes
-macro index,pager H      <Enter><exit><Home><change-folder>!<Enter>
-macro index,pager <Esc>m <Enter><exit><Home><change-folder>=sent-mail<Enter>
+macro index C \
+   <Home><change-folder><Enter> \
+   "Go to the first folder with unread messages"
+macro pager C \
+   <exit><Home><change-folder><Enter> \
+   "Go to the first folder with unread messages"
+
+macro index,pager S \
+   <save-message>!<Enter> \
+   "Move current message to inbox"
+
+macro index,pager <Esc>h \
+   ":auto_view text/html<Enter>" \
+   "View HTML attachments"
+macro index,pager <Esc>H \
+   ":unauto_view text/html<Enter>" \
+   "Don't show HTML attachments"
+
+macro index <Esc>s \
+   "<pipe-message>spamassassin -d | ~/mail/bin/spamcop.py<Enter><next-undeleted>" \
+   "Send spam to SpamCop"
+macro pager <Esc>s \
+   "<exit><pipe-message>spamassassin -d | ~/mail/bin/spamcop.py<Enter><next-undeleted>" \
+   "Send spam to SpamCop"
+macro index <Esc>z \
+   ":set editor='vim -s ~/mail/misc/spamcop.vim'<Enter><reply>:set editor=vim.sh<Enter><exit>n" \
+   "Process message from SpamCop"
+macro pager <Esc>z \
+   "<exit>:set editor='vim -s ~/mail/misc/spamcop.vim'<Enter><reply>:set editor=vim.sh<Enter><exit>n" \
+   "Process message from SpamCop"
+
+macro index H \
+   <Home><change-folder>!<Enter> \
+   "Go to inbox"
+macro pager H \
+   <exit><Home><change-folder>!<Enter> \
+   "Go to inbox"
+macro index M \
+   <Home><change-folder>=sent-mail<Enter> \
+   "Go to sent-mail"
+macro pager M \
+   <exit><Home><change-folder>=sent-mail<Enter> \
+   "Go to sent-mail"
 
 # Go to python mailbox
-macro index,pager Y <Enter><exit><Home><change-folder>=lists/python<Enter>
+macro index Y \
+   <Home><change-folder>=lists/python<Enter> \
+   "Go to python"
+macro pager Y \
+   <exit><Home><change-folder>=lists/python<Enter> \
+   "Go to python"
 
 # Go to STCnet "Atlas"/STM mailboxes
-macro index,pager A      <Enter><exit><Home><change-folder>=stcnet<Enter>
-macro index,pager <Esc>a <Enter><exit><Home><change-folder>=sent-stcnet<Enter>
+macro index A \
+   <Home><change-folder>=stcnet<Enter> \
+   "Go to stcnet inbox"
+macro pager A \
+   <exit><Home><change-folder>=stcnet<Enter> \
+   "Go to stcnet inbox"
+macro index <Esc>a \
+   <Home><change-folder>=sent-stcnet<Enter> \
+   "Go to sent-stcnet"
+macro pager <Esc>a \
+   <exit><Home><change-folder>=sent-stcnet<Enter> \
+   "Go to sent-stcnet"
 
 # Recode base64 to 8bit, html to plain text, mustdie-1251 to koi8-r, etc.
-macro index,pager M "<pipe-message>mimedecode.py | less<Enter>"
+macro index,pager \
+   <Esc>m "<pipe-message>mimedecode.py | less<Enter>" \
+   "View MIME-decoded message"
 macro index,pager E \
-   ":set editor=mimedecode.sh<Enter><edit>:set editor=vim.sh<Enter>"
+   ":set editor=mimedecode.sh<Enter><edit>:set editor=vim.sh<Enter>" \
+   "MIME-decode and save"
 
-# Convert X-Face header to an image and display it
-macro index,pager <Esc>f <pipe-message>~/mail/bin/view-x-face<Enter>
+macro index,pager <Esc>f \
+   <pipe-message>~/mail/bin/view-x-face<Enter> \
+   "Convert X-Face header to an image and display it"
 
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 #