# Macros
#
-# Go to the first folder with unread messages
-macro index C <Home>c\n
-macro pager C q<Home>c\n
-
-# Move current message to inbox
-macro index,pager S s!\n
-
-macro index,pager <Esc>h ":auto_view text/html\n"
-macro index,pager <Esc>H ":unauto_view text/html\n"
-
-# Pipe spam
-#macro index,pager z |"sa-learn --no-sync --ham\n"
-#macro index,pager Z |"sa-learn --no-sync --spam\n"
-macro index,pager <Esc>s "<Enter>q"|"spamassassin -d | ~/mail/bin/spamcop.py\nj"
-macro index,pager <Esc>z "<Enter>q:set editor='vim -s ~/mail/misc/spamcop.vim'\nr:set editor=vim.sh\nqn"
-
-# Go to main mailbox
-macro index H <Home>c!\n
-macro pager H q<Home>c!\n
+macro index,pager C \
+ <Enter><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,pager <Esc>s \
+ "<Enter><exit><pipe-message>spamassassin -d | ~/mail/bin/spamcop.py<Enter><next-undeleted>" \
+ "Send spam to SpamCop"
+macro index,pager <Esc>z \
+ "<Enter><exit>:set editor='vim -s ~/mail/misc/spamcop.vim'<Enter><reply>:set editor=vim.sh<Enter><exit>n" \
+ "Process message from SpamCop"
+
+macro index,pager H \
+ <Enter><exit><Home><change-folder>!<Enter> \
+ "Go to inbox"
+macro index,pager M \
+ <Enter><exit><Home><change-folder>=sent-mail<Enter> \
+ "Go to sent-mail"
# Go to python mailbox
-macro index Y <Home>c=lists/python\n
-macro pager Y q<Home>c=lists/python\n
+macro index,pager Y \
+ <Enter><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> \
+ "Go to stcnet inbox"
+macro index,pager <Esc>a \
+ <Enter><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 "|mimedecode.py | less\n"
-macro index,pager E ":set editor=mimedecode.sh\ne:set editor=vim.sh\n"
-
-# Convert X-Face header to an image and display it
-macro index,pager <Esc>f |"~/mail/bin/view-x-face\n"
+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>" \
+ "MIME-decode and save"
+
+macro index,pager <Esc>f \
+ <pipe-message>~/mail/bin/view-x-face<Enter> \
+ "Convert X-Face header to an image and display it"
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
#