Merge from etch branch.

[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..7f3a8b084f376791535a2abfecdb26aa6f2155c7 100644 (file)
--- a/debian/patches/debian-specific/Muttrc
+++ b/debian/patches/debian-specific/Muttrc
@@ -1,8 +1,8 @@
-Index: trunk/Muttrc.head
+Index: debian-mutt/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 @@
+--- debian-mutt.orig/Muttrc.head       2007-06-08 13:19:22.000000000 +0200
++++ debian-mutt/Muttrc.head    2007-06-08 13:20:36.000000000 +0200
+@@ -6,6 +6,36 @@

  #
  ignore "from " received content- mime-version status x-status message-id
  ignore sender references return-path lines
  #
  ignore "from " received content- mime-version status x-status message-id
  ignore sender references return-path lines


@@ -33,15 +33,18 @@ Index: trunk/Muttrc.head
 +unset bounce_delivered
 +
 +set mixmaster="mixmaster-filter"
 +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"
  
  # 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"
+@@ -18,14 +48,14 @@ macro index,pager,attach,compose \cb "\
+ "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"
  
  # 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"
  
  # 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 +56,7 @@ Index: trunk/Muttrc.head
  #
  # set hostname=cs.hmc.edu
  
  #
  # set hostname=cs.hmc.edu
  

-@@ -84,6 +111,9 @@ attachments   +I text/plain
+@@ -87,6 +117,9 @@ attachments   +I text/plain

  attachments   -A message/external-body
  attachments   -I message/external-body
  
  attachments   -A message/external-body
  attachments   -I message/external-body