a better way of closing 603186 (sidebar-{sorted,dotted} documentation)

[software/mutt-debian.git] / debian / patches / debian-specific / Muttrc

diff --git a/debian/patches/debian-specific/Muttrc b/debian/patches/debian-specific/Muttrc
index 72906b379977fe06f3b2f63972415ed016bf11fe..5af37cc1bd6bdda53283b957d374ab64186b8bad 100644 (file)
--- a/debian/patches/debian-specific/Muttrc
+++ b/debian/patches/debian-specific/Muttrc
@@ -1,16 +1,14 @@
-Index: trunk/Muttrc.head
-===================================================================
---- trunk.orig/Muttrc.head     2007-03-15 16:33:18.000000000 +0100
-+++ trunk/Muttrc.head  2007-03-15 16:35:15.000000000 +0100
-@@ -6,6 +6,33 @@
- #
- ignore "from " received content- mime-version status x-status message-id
- ignore sender references return-path lines
-+ignore date delivered-to precedence errors-to in-reply-to user-agent
-+ignore x-loop x-sender x-mailer x-msmail-priority x-mimeole x-ms- x-priority
-+ignore x-accept-language x-authentication-warning thread- priority importance
-+ignore x-original-to domainkey-signature dkim-signature
-+
+# vim:ft=diff
+
+ * 2009-01-15 myon: refreshed for mutt-1.5.19; drop our list of ignored headers
+   in favor of upstream's new unignore list
+
+--- a/doc/Muttrc.head
++++ b/doc/Muttrc.head
+@@ -12,6 +12,34 @@
+ # Display the fields in this order
+ hdr_order date from to cc subject
+ 
 +# emacs-like bindings
 +bind editor    "\e<delete>"    kill-word
 +bind editor    "\e<backspace>" kill-word
@@ -26,22 +24,28 @@ Index: trunk/Muttrc.head
 +# Specifies how to sort messages in the index menu.
 +set sort=threads
 +
-+# Uncomment if your MTA does not strip Bcc: headers.
-+# (exim4 and postfix strip them, exim(3) does not.)
++# The behavior of this option on the Debian mutt package is
++# not the original one because exim4, the default SMTP on Debian
++# does not strip bcc headers so this can cause privacy problems;
++# see man muttrc for more info
 +#unset write_bcc
 +# Postfix and qmail use Delivered-To for detecting loops
 +unset bounce_delivered
 +
 +set mixmaster="mixmaster-filter"
- 
++
++# System-wide CA file managed by the ca-certificates package
++set ssl_ca_certificates_file="/etc/ssl/certs/ca-certificates.crt"
++
  # imitate the old search-body function
  macro index \eb "<search>~b " "search in message bodies"
-@@ -15,14 +42,14 @@ macro index,pager \cb "<pipe-message> ur
- macro attach,compose \cb "<pipe-entry> urlview<Enter>" "call urlview to extract URLs out of a message"
+ 
+@@ -23,14 +51,14 @@
+ "call urlview to extract URLs out of a message"
  
  # Show documentation when pressing F1
 -macro generic,pager <F1> "<shell-escape> less @docdir@/manual.txt<Enter>" "show Mutt documentation"
-+macro generic,pager <f1> "<shell-escape> zcat @docdir@/mutt/manual.txt.gz | sensible-pager<enter>" "show Mutt documentation"
++macro generic,pager <F1> "<shell-escape> zcat @docdir@/mutt/manual.txt.gz | sensible-pager<enter>" "show Mutt documentation"
  
  # show the incoming mailboxes list (just like "mutt -y") and back when pressing "y"
  macro index,pager y "<change-folder>?<toggle-mailboxes>" "show incoming mailboxes list"
@@ -53,7 +57,18 @@ Index: trunk/Muttrc.head
  #
  # set hostname=cs.hmc.edu
  
-@@ -84,6 +111,9 @@ attachments   +I text/plain
+@@ -42,6 +70,10 @@
+ # be undone with unmime_lookup.
+ mime_lookup application/octet-stream
+ 
++# Upgrade the progress counter every 250ms, good for mutt over SSH
++# see http://bugs.debian.org/537746
++set time_inc=250
++
+ ##
+ ## *** DEFAULT SETTINGS FOR THE ATTACHMENTS PATCH ***
+ ##
+@@ -96,6 +128,9 @@
  attachments   -A message/external-body
  attachments   -I message/external-body