Merge branch 'master' of ssh://git.madduck.net/srv/git/git.madduck.net/pub/etc/mutt

diff --git a/.gitignore b/.mutt/.gitignore
similarity index 100%
rename from .gitignore
rename to .mutt/.gitignore

diff --git a/add-tickle-stamp b/.mutt/add-tickle-stamp
similarity index 100%
rename from add-tickle-stamp
rename to .mutt/add-tickle-stamp

diff --git a/alternates b/.mutt/alternates
similarity index 100%
rename from alternates
rename to .mutt/alternates

diff --git a/colours b/.mutt/colours
similarity index 100%
rename from colours
rename to .mutt/colours

diff --git a/headers b/.mutt/headers
similarity index 100%
rename from headers
rename to .mutt/headers

diff --git a/hooks b/.mutt/hooks
similarity index 100%
rename from hooks
rename to .mutt/hooks

diff --git a/keybindings b/.mutt/keybindings
similarity index 72%
rename from keybindings
rename to .mutt/keybindings
index c8930b4e8323f526fe70d4531862a98501a78027..d88fddd7496d636f5542c74a454aed3fdfa85e81 100644 (file)
--- a/keybindings
+++ b/.mutt/keybindings
@@ -1,6 +1,5 @@
 bind index,pager       |       pipe-message
 bind index,pager       !       flag-message
-bind index,pager       \Cd     delete-thread
 bind index,pager       \ep     print-message
 bind index,pager       <up>    previous-entry
 bind index,pager       <down>  next-entry
@@ -22,7 +21,14 @@ bind pager,index     <backtab>       previous-unread
 macro index,pager      S       "<save-message>=store<enter><sync-mailbox>" "save message to store"
 macro index,pager      E       ':set my_editor="$editor"<enter>:set editor="$my_confdir/add-tickle-stamp"<enter><edit><toggle-new><save-message>=tickler<enter><sync-mailbox>:set editor="$my_editor"<enter>' "schedule message with tickler"
 
-macro index,pager      \eS     "<change-folder>=store<enter>" "go to store folder"
+macro index,pager      \eS     "<decode-save>"
+macro index,pager      \eU     "<undelete-subthread>"
+macro index,pager      \eD     "<delete-subthread>"
+macro index,pager      \es     "<change-folder>=store<enter>" "go to store folder"
+macro index,pager      \ed     "<change-folder>=debian<enter>" "go to debian folder"
+macro index,pager      \ei     "<change-folder>=inbox<enter>" "go to inbox folder"
+macro index,pager      \eu     "<change-folder>=ul<enter>" "go to ul folder"
+macro index,pager      \ea     "<change-folder>=admin<enter>" "go to admin folder"
 
 macro index,pager      \eR     ":source $my_confdir/muttrc<enter>" "reload muttrc"
 macro compose  \eR     ":source $my_confdir/muttrc<enter>" "reload muttrc"
@@ -32,6 +38,11 @@ macro index,pager    Z       "<save-message>=retrain/ham<enter>" "retrain message as ham"
 
 macro index,pager      \Cb     ':set my_pipe_decode="$pipe_decode"<enter>:set pipe_decode<enter><pipe-message>/usr/bin/urlview<enter>:set pipe_decode="$my_pipe_decode"<enter>' "invoke urlview"
 
+macro compose  Y       '<edit-fcc><kill-line><enter><send-message>' "send message without storing"
+macro compose  \Cy     '<pgp-menu>cY' "send message without storing or signing"
+
+macro index            F       '<limit>~L ' "search for correspondents"
+
 #TODO this is a hack until switch-profile does not readd headers.
 macro compose  e       ':set my_editor="$editor"<enter>:set editor=sensible-editor<enter><edit-headers>:set editor="$my_editor"<enter>' "invoke normal editor to edit message"
 macro index,pager      e       ':set my_editor="$editor"<enter>:set editor=sensible-editor<enter><edit>:set editor="$my_editor"<enter>' "invoke normal editor to edit message"

diff --git a/lists b/.mutt/lists
similarity index 99%
rename from lists
rename to .mutt/lists
index e1e27abe82411dcb56b35f33e3225e1c66c622cf..b67d708c776a6ec285d21c2971fd5e59e5346c31 100644 (file)
--- a/lists
+++ b/.mutt/lists
@@ -216,5 +216,6 @@ subscribe xfs@oss.sgi.com
 #subscribe zope@zope.org
 #subscribe zwiki@zwiki.org
 subscribe revctrl@lists.zooko.com
+subscribe (chat|announce)@lists.mel8ourne.org
 
 # vim:ft=muttrc

diff --git a/muttrc b/.mutt/muttrc
similarity index 99%
rename from muttrc
rename to .mutt/muttrc
index 9c7bf45ca9fa250d144e7e8795d8a9dfd4bcb4cf..8886c6ec8e08a9529fdd85faeed9930d8067327b 100644 (file)
--- a/muttrc
+++ b/.mutt/muttrc
@@ -2974,6 +2974,7 @@ set pgp_auto_decode=yes
 # will weed headers and will attempt to PGP/MIME decode the messages
 # first.
 # 
+set pipe_decode
 # 
 # set pipe_sep="\n"
 #
@@ -3364,7 +3365,7 @@ set record="=store"
 # and replying. The default value corresponds to the English "Re:" and
 # the German "Aw:".
 # 
-set reply_regexp="^((re([[(]?[[:digit:]]+[)]]?)?|aw|antwort|wg):[[:space:]]*)+"
+set reply_regexp="^((re([[(]?[[:digit:]]+[)]]?)?|aw|antwort|wg|sgkb):[[:space:]]*)+"
 # 
 # set reply_self=no
 #

diff --git a/offline b/.mutt/offline
similarity index 100%
rename from offline
rename to .mutt/offline

diff --git a/sendmail b/.mutt/sendmail
similarity index 100%
rename from sendmail
rename to .mutt/sendmail

diff --git a/spam b/.mutt/spam
similarity index 100%
rename from spam
rename to .mutt/spam

diff --git a/.var/mutt/.gitignore b/.var/mutt/.gitignore
new file mode 100644 (file)
index 0000000..120f485
--- /dev/null
+++ b/.var/mutt/.gitignore
@@ -0,0 +1,2 @@
+*
+!/.gitignore