624085-gnutls-deprecated-verify-peers.patch: deprecate gnutls_certificate_verify_peer...

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

diff --git a/debian/patches/debian-specific/Muttrc b/debian/patches/debian-specific/Muttrc
index 02173faf373f6f41a6177efc7653e1c0fecc2412..eb2d6cb92b188881ec8ecba13c227609827d3b1c 100644 (file)
--- a/debian/patches/debian-specific/Muttrc
+++ b/debian/patches/debian-specific/Muttrc
@@ -5,7 +5,7 @@
 
 --- a/doc/Muttrc.head
 +++ b/doc/Muttrc.head
 
 --- a/doc/Muttrc.head
 +++ b/doc/Muttrc.head

-@@ -12,6 +12,32 @@ unignore from: subject to cc date x-mail
+@@ -12,6 +12,34 @@

  # Display the fields in this order
  hdr_order date from to cc subject
  
  # Display the fields in this order
  hdr_order date from to cc subject
  


@@ -24,8 +24,10 @@
 +# Specifies how to sort messages in the index menu.
 +set sort=threads
 +
 +# Specifies how to sort messages in the index menu.
 +set sort=threads
 +

-+# Uncomment if your MTA does not strip Bcc: headers.
-+# (postfix strips them, exim4 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
 +#unset write_bcc
 +# Postfix and qmail use Delivered-To for detecting loops
 +unset bounce_delivered


@@ -38,7 +40,7 @@
  # imitate the old search-body function
  macro index \eb "<search>~b " "search in message bodies"
  
  # imitate the old search-body function
  macro index \eb "<search>~b " "search in message bodies"
  

-@@ -23,7 +49,7 @@ macro index,pager,attach,compose \cb "\
+@@ -23,14 +51,14 @@

  "call urlview to extract URLs out of a message"
  
  # Show documentation when pressing F1
  "call urlview to extract URLs out of a message"
  
  # Show documentation when pressing F1


@@ -47,8 +49,7 @@
  
  # 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"
  
  # 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"

-@@ -35,7 +61,7 @@ bind browser y exit
- # append-hook \\.gz$ "gzip -c %t >> %f"
+ bind browser y exit

  
  # If Mutt is unable to determine your site's domain name correctly, you can
 -# set the default here.
  
  # If Mutt is unable to determine your site's domain name correctly, you can
 -# set the default here.


@@ -56,13 +57,14 @@
  #
  # set hostname=cs.hmc.edu
  
  #
  # set hostname=cs.hmc.edu
  

-@@ -101,6 +127,9 @@ attachments   +I text/plain
- attachments   -A message/external-body
- attachments   -I message/external-body
+@@ -42,6 +70,10 @@
+ # be undone with unmime_lookup.
+ mime_lookup application/octet-stream

  
  

-+# enable mime lookup by extension
-+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

 +
  ##
 +
  ##

- ## More settings
+ ## *** DEFAULT SETTINGS FOR THE ATTACHMENTS PATCH ***

  ##
  ##