(mm-dissect-buffer): Use message-fetch-field instead of mail-fetch-field to

fetch Content-Description header in order to exclude newlines.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a5606c6..ac85af8 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2009-06-22  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * mm-decode.el (mm-dissect-buffer): Use message-fetch-field instead of
+       mail-fetch-field to fetch Content-Description header in order to
+       exclude newlines.
+
 2009-06-18  Ulrich Mueller  <ulm@gentoo.org>
 
        * pgg-gpg.el (pgg-gpg-lookup-key-owner): Handle colon listings

diff --git a/lisp/mm-decode.el b/lisp/mm-decode.el
index ead419e..098f091 100644 (file)
--- a/lisp/mm-decode.el
+++ b/lisp/mm-decode.el
@@ -563,7 +563,9 @@ Postpone undisplaying of viewers for types in
                ctl (and ct (mail-header-parse-content-type ct))
                cte (mail-fetch-field "content-transfer-encoding")
                cd (mail-fetch-field "content-disposition")
-               description (mail-fetch-field "content-description")
+               ;; Newlines in description should be stripped so as
+               ;; not to break the MIME tag into two or more lines.
+               description (message-fetch-field "content-description")
                id (mail-fetch-field "content-id"))
          (unless from
            (setq from (mail-fetch-field "from")))