merge newest Muttrc

diff --git a/.mutt/muttrc b/.mutt/muttrc
index 425a24b6ea326cb18f3a45370273201c04e8adac..8719cec1946117aa5e3230c57fb0545b54f08bef 100644 (file)
--- a/.mutt/muttrc
+++ b/.mutt/muttrc
@@ -711,6 +711,9 @@ set delete=yes
 # This option allows you to edit the header of your outgoing messages
 # along with the body of your message.
 # 
 # This option allows you to edit the header of your outgoing messages
 # along with the body of your message.
 # 

+# Note that changes made to the References: and Date: headers are
+# ignored for interoperability reasons.
+# 

 set edit_headers=yes
 # 
 # set editor=""
 set edit_headers=yes
 # 
 # set editor=""


@@ -945,7 +948,7 @@ set folder="~/mail"
 # is unset.
 # 
 # Defaults to the contents of the environment variable EMAIL.
 # is unset.
 # 
 # Defaults to the contents of the environment variable EMAIL.

-#
+# 

 set from='martin f krafft <madduck@madduck.net>'
 # 
 # set gecos_mask="^[^,]*"
 set from='martin f krafft <madduck@madduck.net>'
 # 
 # set gecos_mask="^[^,]*"


@@ -1534,7 +1537,7 @@ set index_format="%4C %Z %{%b %d} %-15.15F %4c %?H?[%H] ?%s"
 # 
 # 
 # This variable configures how often (in seconds) mutt should look for
 # 
 # 
 # This variable configures how often (in seconds) mutt should look for

-# new mail.
+# new mail. Also see the ``$timeout'' variable.

 # 
 # 
 # set mailcap_path=""
 # 
 # 
 # set mailcap_path=""


@@ -3288,6 +3291,31 @@ set print_split=yes
 # 
 set query_command="lbdbq"
 # 
 # 
 set query_command="lbdbq"
 # 

+# set query_format="%4c %t %-25.25a %-25.25n %?e?(%e)?"
+#
+# Name: query_format
+# Type: string
+# Default: "%4c %t %-25.25a %-25.25n %?e?(%e)?"
+# 
+# 
+# This variable describes the format of the `query' menu. The
+# following printf-style sequences are understood:
+# 
+# %a      destination address
+# %c      current entry number
+# %e      extra information *
+# %n      destination name
+# %t      ``*'' if current entry is tagged, a space otherwise
+# %>X     right justify the rest of the string and pad with "X"
+# %|X     pad to the end of the line with "X"
+# %*X     soft-fill with character "X" as pad
+# 
+# 
+# For an explanation of `soft-fill', see the ``$index_format'' documentation.
+# 
+# * = can be optionally printed if nonzero, see the ``$status_format'' documentation.
+# 
+# 

 # set quit=yes
 #
 # Name: quit
 # set quit=yes
 #
 # Name: quit


@@ -3486,7 +3514,7 @@ set reply_regexp="^((re([[(]?[[:digit:]]+[)]]?)?|aw|antwort|wg|sgkb):[[:space:]]
 # alternates.  If the variable is unset, or the address that would be
 # used doesn't match your alternates, the From: line will use
 # your address on the current machine.
 # alternates.  If the variable is unset, or the address that would be
 # used doesn't match your alternates, the From: line will use
 # your address on the current machine.

-#
+# 

 set reverse_name=yes
 # 
 # set reverse_realname=yes
 set reverse_name=yes
 # 
 # set reverse_realname=yes