.profile, .shellrc: minor refactoring

[dotfiles.git] / .muttrc

diff --git a/.muttrc b/.muttrc
index 3659ad160b31d03d4098bbc5906d47e865be375b..86a40fc8e0816da84876cc685b4d51cbfceda3bf 100644 (file)
--- a/.muttrc
+++ b/.muttrc
@@ -253,7 +253,7 @@ send-hook "~L '@(mail|list|inbox|bk)\.ru'" "\
    set signature='iconv -f koi8-r ~/mail/signatures/phd@mail.ru|'"
 
 send-hook "~L '(@|\.)(((ya|yandex|narod)\.ru)|(yandex\.com)|yandex-team\.ru)$'" "\
-   my_hdr From: Олег Бройтман <phd2@yandex.ru>; \
+   my_hdr From: Олег Бройтман <phd@phdru.name>; \
    my_hdr Reply-To: Олег Бройтман <phd2@yandex.ru>; \
    my_hdr X-Url: http://phd2.ya.ru/; \
    set signature='iconv -f koi8-r ~/mail/signatures/phd2@yandex.ru|'"
@@ -285,7 +285,7 @@ bind index,pager <Esc>S decode-save
 macro index C \
    <Home><change-folder><Enter> \
    "Go to the first folder with unread messages"
-macro pager C \
+macro pager,attach C \
    <exit><Home><change-folder><Enter> \
    "Go to the first folder with unread messages"
 
@@ -316,13 +316,13 @@ macro pager <Esc>z \
 macro index H \
    <Home><change-folder>!<Enter> \
    "Go to inbox"
-macro pager H \
+macro pager,attach 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 \
+macro pager,attach M \
    <exit><Home><change-folder>=sent-mail<Enter> \
    "Go to sent-mail"
 
@@ -330,7 +330,7 @@ macro pager M \
 macro index Y \
    <Home><change-folder>=lists/python<Enter> \
    "Go to python"
-macro pager Y \
+macro pager,attach Y \
    <exit><Home><change-folder>=lists/python<Enter> \
    "Go to python"
 
@@ -338,13 +338,13 @@ macro pager Y \
 macro index A \
    <Home><change-folder>=stcnet<Enter> \
    "Go to stcnet inbox"
-macro pager A \
+macro pager,attach 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 \
+macro pager,attach <Esc>a \
    <exit><Home><change-folder>=sent-stcnet<Enter> \
    "Go to sent-stcnet"
 
@@ -403,7 +403,7 @@ color tilde       blue           default
 color tree        blue           default
 
 # email
-color body        brightblue     default [-a-Z_0-9.+]+@[-a-Z_0-9.]+
+color body        brightmagenta  default [-a-Z_0-9.+]+@[-a-Z_0-9.]+
 
 # URLs
 color body        brightblue     default "(((https?|ftp|gopher|telnet)://|(mailto|file|news|about|ed2k|irc|sip|magnet):)[^' \t<>\"]+)[A-Za-z0-9/]"