add more patches; improve mailcap; extend muttrc

mutt/mailcap

@@ -1,13 +1,18 @@
 ##
 ##  @l_prefix@/etc/mutt/mailcap -- Global Mutt Mail Capability Database
-##  Copyright (c) 1998-2001 Ralf S. Engelschall <rse@engelschall.com>
+##  Copyright (c) 1998-2003 Ralf S. Engelschall <rse@engelschall.com>
 ##
 
-text/html;              (w3m %s) 2>/dev/null || (lynx %s) 2>/dev/null || netscape -remote openURL\(%s\)
-image/gif;              (xv %s) 2>/dev/null || display %s
-image/jpg;              (xv %s) 2>/dev/null || display %s
-image/jpeg;             (xv %s) 2>/dev/null || display %s
-application/pdf;        (mgv %s) 2>/dev/null || (gv %s) 2>/dev/null || (ghostview %s) 2>/dev/null || gs %s
-application/postscript; (mgv %s) 2>/dev/null || (gv %s) 2>/dev/null || (ghostview %s) 2>/dev/null || gs %s
-application/x-dvi;      xdvi %s
+text/html;                     (w3m %s) 2>/dev/null || (lynx %s) 2>/dev/null || mozilla -remote openURL\(%s\); nametemplate=%s.html
+text/html;                     (w3m -dump %s) 2>/dev/null || (lynx -dump %s) 2>/dev/null || cat; nametemplate=%s.html; copiousoutput
+image/*;                       (display %s) 2>/dev/null || xv %s
+image/*;                       (anytopnm %s | pnmscale -xysize 80 46 | ppmtopgm | pgmtopbm | pbmtoascii -1x2) 2>&1; copiousoutput
+video/*;                       mplayer %s
+application/pdf;               (acroread %s) 2>/dev/null || (mgv %s) 2>/dev/null || (gv %s) 2>/dev/null || (ghostview %s) 2>/dev/null || gs %s
+application/postscript;        (mgv %s) 2>/dev/null || (gv %s) 2>/dev/null || (ghostview %s) 2>/dev/null || gs %s
+application/x-dvi;             xdvi %s
+application/vnd.ms-powerpoint; (msov --format=ppt %s) 2>/dev/null || openoffice %s
+application/vnd.ms-excel;      (msov --format=xls %s) 2>/dev/null || openoffice %s
+application/vnd.ms-word;       (msov --format=doc %s) 2>/dev/null || openoffice %s
+application/msword;            (msov --format=doc %s) 2>/dev/null || openoffice %s
 

mutt/mutt.spec

@@ -24,7 +24,7 @@
 ##
 
 #   package version
-%define       V_mutt      1.4.1
+%define       V_mutt         1.4.1
 
 #   package information
 Name:         mutt
@@ -36,11 +36,13 @@ Distribution: OpenPKG [BASE]
 Group:        Mail
 License:      BSD
 Version:      %{V_mutt}i
-Release:      20030717
+Release:      20030817
 
 #   build options
-%option       with_comp   no
-%option       with_nntp   no
+%option       with_comp      no
+%option       with_nntp      no
+%option       with_initials  no
+%option       with_quote     no
 
 #   list of sources
 Source0:      ftp://ftp.mutt.org/mutt/mutt-%{V_mutt}i.tar.gz
@@ -48,6 +50,8 @@ Source1:      mailcap
 Source2:      muttrc
 Patch0:       ftp://ftp.mutt.org.ua/pub/mutt/mutt-%{V_mutt}/patch-%{V_mutt}.rr.compressed.gz
 Patch1:       ftp://ftp.mutt.org.ua/pub/mutt/mutt-%{V_mutt}/patch-%{V_mutt}.vvv.nntp.gz
+Patch2:       ftp://ftp.mutt.org.ua/pub/mutt/mutt-%{V_mutt}/patch-%{V_mutt}.vvv.initials.gz
+Patch3:       ftp://ftp.mutt.org.ua/pub/mutt/mutt-%{V_mutt}/patch-%{V_mutt}.vvv.quote.gz
 
 #   build information
 Prefix:       %{l_prefix}
@@ -72,6 +76,12 @@ AutoReqProv:  no
 %if "%{with_nntp}" == "yes"
     %patch1 -p1
 %endif
+%if "%{with_initials}" == "yes"
+    %patch2 -p1
+%endif
+%if "%{with_quote}" == "yes"
+    %patch3 -p1
+%endif
 
 %build
     #   configure for particular platform

mutt/muttrc

@@ -46,7 +46,8 @@ ignore "from "
 #   display customization
 set to_chars = "L CC "
 set charset = iso-8859-1
-set quote_regexp = "^([ \t]*>)+"
+set quote_regexp="^[ \t]*([A-Za-z ]+>|[]>:}][]>:}]*)"
+set smileys="(>From )|(>?[;:][-^]?[][)(><}{|/DP][)}]*)"
 mono quoted bold
 mono markers bold
 set menu_scroll
@@ -69,14 +70,22 @@ set include = yes
 set forw_format = "[FWD] %s"
 unset mime_fwd
 unset forw_quote
+unset metoo
 
 #   new mail generation
 set hdrs
 set use_8bitmime
 
+#   autoviewing via .mailcap handlers
+auto_view text/html image/*
+
 #   no printing by default
 set print = no
 
+#   toggle sort mode
+macro index \cxd set sort=date-sent
+macro index \cxt set sort=threads
+
 #   show documentation on <ESC>+'h'
 macro generic "\eh" "!${PAGER-more} @l_prefix@/share/mutt/manual.txt\n" "Show Mutt Manual"
 macro index   "\eh" "!${PAGER-more} @l_prefix@/share/mutt/manual.txt\n" "Show Mutt Manual"