upstream/393926-internal-viewer.patch: display any text/* part with the internal...

diff --git a/debian/changelog b/debian/changelog
index 36aed2c5d26a02dfef55b0d3529ee8d10c49019d..d00b8206bbb35266b67d4dc33cd1d1f3ad5d99e4 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ mutt (1.5.20-3) UNRELEASED; urgency=low
     + features/ifdef: fixed a typo (Closes: 539974)
     + debian-specific/Muttrc: correctly state that exim4 does not strip Bcc:
       headers (Closes: 474194)
+    + upstream/393926-internal-viewer.patch: display any text/* part with the
+      internal viewer (Closes: 393926)
     + upstream/538128-mh-folder-access.patch: MH dirs are now correctly
       parsed (Closes: 538128)
     + upstream/537818-emptycharset.patch: handling empty charsets without

diff --git a/debian/patches/series b/debian/patches/series
index bcbefad8ea3fd78d67a2c0ab94e2646748a909d5..6f73848ba0626ca730c4d6ca07185f6991aab37a 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -42,6 +42,7 @@ upstream/535096-pop-port.patch
 upstream/542910-search-segfault.patch
 upstream/533370-pgp-inline.patch
 upstream/533520-signature-highlight.patch
+upstream/393926-internal-viewer.patch
 misc/hyphen-as-minus.patch
 #misc/manpage-typos.patch
 misc/smime_keys-manpage.patch

diff --git a/debian/patches/upstream/393926-internal-viewer.patch b/debian/patches/upstream/393926-internal-viewer.patch
new file mode 100644 (file)
index 0000000..70c4575
--- /dev/null
+++ b/debian/patches/upstream/393926-internal-viewer.patch
@@ -0,0 +1,19 @@
+Display any text/* part with the internal viewer, see upstream bug
+http://bugs.mutt.org/3246
+
+--- a/muttlib.c
++++ b/muttlib.c
+@@ -622,11 +622,8 @@
+   switch (m->type)
+   {
+     case TYPETEXT:
+-
+-      if (!ascii_strcasecmp ("plain", m->subtype) ||
+-        !ascii_strcasecmp ("rfc822-headers", m->subtype) ||
+-        !ascii_strcasecmp ("enriched", m->subtype))
+-      return 0;
++      /* we can display any text, overridable by auto_view */
++      return 0;
+       break;
+ 
+     case TYPEAPPLICATION: