- more, too bad this patch was applied incorrectly, thus never really in effect

Changed files:
    mutt-Muttrc.patch -> 1.3

diff --git a/mutt-Muttrc.patch b/mutt-Muttrc.patch
index bd3d4ce93070443d2695c21d6ab9085195a824ee..f615e8a7cef5adde9f682e1efda68d8db7b27dc6 100644 (file)
--- a/mutt-Muttrc.patch
+++ b/mutt-Muttrc.patch
@@ -1,53 +1,120 @@
---- mutt-1.5.18.org/doc/Muttrc 2007-04-25 08:29:15.220571000 +0200
-+++ mutt-1.5.18/doc/Muttrc     2007-04-25 08:31:58.895287410 +0200
-@@ -3692,6 +3692,7 @@
- # a value of zero for this option suppresses the pause.
+diff -urN mutt-1.5.19/doc/Muttrc mutt-1.5.19.conf/doc/Muttrc
+--- mutt-1.5.19/doc/Muttrc     2009-04-13 19:07:38.103582891 +0200
++++ mutt-1.5.19.conf/doc/Muttrc        2009-04-13 18:29:07.652668002 +0200
+@@ -1033,6 +1033,7 @@
+ # 
+ # 
+ # set forward_format="[%a: %s]"
++set forward_format="Fwd: %s"
+ #
+ # Name: forward_format
+ # Type: string
+@@ -1203,6 +1204,7 @@
+ # 
+ # 
+ # set history=10
++set history=100
+ #
+ # Name: history
+ # Type: number
+@@ -1775,6 +1777,7 @@
+ # 
+ # 
+ # set mark_old=yes
++set mark_old=no
+ #
+ # Name: mark_old
+ # Type: boolean
+@@ -1947,6 +1950,7 @@
+ # 
+ # 
+ # set mime_forward=no
++set mime_forward=ask-no
+ #
+ # Name: mime_forward
+ # Type: quadoption
+@@ -2115,6 +2119,7 @@
+ # 
+ # 
+ # set pager_context=0
++set pager_context=1
+ #
+ # Name: pager_context
+ # Type: number
+@@ -2141,6 +2146,7 @@
+ # 
+ # 
+ # set pager_index_lines=0
++set pager_index_lines=6
+ #
+ # Name: pager_index_lines
+ # Type: number
+@@ -3208,6 +3214,7 @@
+ # 
+ # 
+ # set ssl_ca_certificates_file=""
++set ssl_ca_certificates_file="/etc/certs/ca-certificates.crt"
+ #
+ # Name: ssl_ca_certificates_file
+ # Type: path
+@@ -3546,6 +3553,7 @@
+ # 
+ # 
+ # set quit=yes
++set quit=ask-yes
+ #
+ # Name: quit
+ # Type: quadoption
+@@ -3680,6 +3688,7 @@
+ # 
+ # 
+ # set reply_regexp="^(re([\\[0-9\\]+])*|aw):[ \t]*"
++set reply_regexp="^(([oO][dD][pP]|[aA][wW]|[rR][eE]([\\[0-9\\]+])*:|[Oo][dD][pP]:|[aA][wW]:|[rR][eE]:)[ \t]+)*"
+ #
+ # Name: reply_regexp
+ # Type: regular expression
+@@ -3915,6 +3924,7 @@
+ # 
+ # 
+ # set send_charset="us-ascii:iso-8859-1:utf-8"
++set send_charset="us-ascii:utf-8"
+ #
+ # Name: send_charset
+ # Type: string
+@@ -4019,6 +4029,7 @@
+ # 
+ # 
+ # set simple_search="~f %s | ~s %s"
++set simple_search="~f %s | ~C %s | ~s %s"
+ #
+ # Name: simple_search
+ # Type: string
+@@ -4126,6 +4137,7 @@

  # 
  # 
  # 
  # 

-+set sort=threads

  # set sort=date
  # set sort=date

++set sort=threads

  #
  # Name: sort
  #
  # Name: sort

-@@ -3732,6 +3733,7 @@
- #    unsorted (leave in order specified in .muttrc)
- # 
- # 
-+set sort_aux=reverse-date
- # set sort_aux=date
- #
- # Name: sort_aux
-@@ -3754,6 +3756,7 @@
- # but kept to not break any existing configuration setting).
- # 
- # 
-+set sort_browser=alpha
- # set sort_browser=alpha
- #
- # Name: sort_browser
-@@ -4242,4 +4245,25 @@
- # Controls whether mutt writes out the Bcc header when preparing
- # messages to be sent.  Exim users may wish to unset this.
- # 
--# 
-+#
-+
-+color hdrdefault red default
-+color quoted brightblue default
-+color signature red default
-+color indicator brightyellow red
-+color error brightred default
-+color status yellow blue
-+color tree magenta default      # the thread tree in the index menu
-+color tilde magenta default
-+color message brightcyan default
-+color markers brightcyan default
-+color attachment brightmagenta default
-+color search default green      # how to hilite search patterns in the pager
-+
-+color header brightred default ^(From|Subject):
-+color body magenta default "(ftp|http)://[^ ]+" # point out URLs
-+color body magenta default [-a-z_0-9.]+@[-a-z_0-9.]+    # e-mail addresses
-+color underline brightgreen default
-+
-+mono quoted bold
-+ 
+ # Type: sort order
+@@ -4436,6 +4448,7 @@
+ # 
+ # 
+ # set thorough_search=no
++set thorough_search=yes
+ #
+ # Name: thorough_search
+ # Type: boolean
+@@ -4455,6 +4468,7 @@
+ # 
+ # 
+ # set tilde=no
++set tilde=yes
+ #
+ # Name: tilde
+ # Type: boolean
+@@ -4772,3 +4786,4 @@
+ # in an X11 terminal emulator.
+ # 
+ # 
++source mutt_source-muttrc.d|