.muttrc: change some macros

[dotfiles.git] / .muttrc

diff --git a/.muttrc b/.muttrc
index 8ff8a6af1d7ae076b53a569921754b9811195b3a..29cc6f04139e281f279b6bde5f777309f1f1d609 100644 (file)
--- a/.muttrc
+++ b/.muttrc
@@ -163,6 +163,7 @@ my_hdr X-Operating-System: Debian GNU/Linux
 #       lists <list-name> [ <list-name> ... ]
 
 subscribe (python-(announce|dev|ideas)|.*-(list|sig))@python\.org \
+   core-workflow@python\.org \
    .*@moderators\.isc\.org .*@lists\.sourceforge\.net \
    (durus|quixote)-users@mems-exchange\.org pysqlite@lists\.initd\.org \
    .*@googlegroups\.com mlug@unixcenter\.ru
@@ -283,35 +284,38 @@ bind index,pager <Esc>S decode-save
 #
 
 # Go to the first folder with unread messages
-macro index C  <Home>c\n
-macro pager C q<Home>c\n
+macro index,pager C <Enter><exit><Home><change-folder><Enter>
 
 # Move current message to inbox
-macro index,pager S s!\n
+macro index,pager S <save-message>!<Enter>
 
-macro index,pager <Esc>h ":auto_view text/html\n"
-macro index,pager <Esc>H ":unauto_view text/html\n"
+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 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"
+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><reply>:set editor=vim.sh<Enter><exit><next-undeleted>"
 
-# Go to main mailbox
-macro index H  <Home>c!\n
-macro pager H q<Home>c!\n
+# Go to main mailboxes
+macro index,pager H <Enter><exit><Home><change-folder>!<Enter>
+macro index,pager M <Enter><exit><Home><change-folder>=sent-mail<Enter>
 
 # 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 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>
 
 # 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"
+macro index,pager <Esc>m "<pipe-message>mimedecode.py | less<Enter>"
+macro index,pager E \
+   ":set editor=mimedecode.sh<Enter><edit>:set editor=vim.sh<Enter>"
 
 # 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>f <pipe-message>~/mail/bin/view-x-face<Enter>
 
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 #