Introduce two new patches that revert the conflicting part of the

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

diff --git a/debian/patches/debian-specific/Muttrc b/debian/patches/debian-specific/Muttrc
index 7f3a8b084f376791535a2abfecdb26aa6f2155c7..88a08d7444ee3c7fd4dde5fbdf89e3db26745faa 100644 (file)
--- a/debian/patches/debian-specific/Muttrc
+++ b/debian/patches/debian-specific/Muttrc
@@ -1,7 +1,5 @@
-Index: debian-mutt/Muttrc.head
-===================================================================
---- 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
+--- a/doc/Muttrc.head
++++ b/doc/Muttrc.head
 @@ -6,6 +6,36 @@
  #
  ignore "from " received content- mime-version status x-status message-id
@@ -39,7 +37,7 @@ Index: debian-mutt/Muttrc.head
  
  # imitate the old search-body function
  macro index \eb "<search>~b " "search in message bodies"
-@@ -18,14 +48,14 @@ macro index,pager,attach,compose \cb "\
+@@ -18,7 +48,7 @@ macro index,pager,attach,compose \cb "\
  "call urlview to extract URLs out of a message"
  
  # Show documentation when pressing F1
@@ -48,7 +46,8 @@ Index: debian-mutt/Muttrc.head
  
  # 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"
- bind browser y exit
+@@ -30,7 +60,7 @@ bind browser y exit
+ # append-hook \\.gz$ "gzip -c %t >> %f"
  
  # If Mutt is unable to determine your site's domain name correctly, you can
 -# set the default here.
@@ -56,7 +55,7 @@ Index: debian-mutt/Muttrc.head
  #
  # set hostname=cs.hmc.edu
  
-@@ -87,6 +117,9 @@ attachments   +I text/plain
+@@ -92,6 +122,9 @@ attachments   +I text/plain
  attachments   -A message/external-body
  attachments   -I message/external-body