Mercurial > emacs

changeset 68211:3299c642df41

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* mh-mime.el (mh-mime-display, mh-mm-inline-message): Fix use of mm- functions for text=flowed. (SF #1273521)
author Mark D. Baushke <mdb@gnu.org>
date Mon, 16 Jan 2006 19:42:53 +0000
parents 64f09dba41dc
children 0c77c0b9a620
files lisp/mh-e/ChangeLog lisp/mh-e/mh-mime.el
diffstat 2 files changed, 15 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/mh-e/ChangeLog	Mon Jan 16 12:08:35 2006 +0000
+++ b/lisp/mh-e/ChangeLog	Mon Jan 16 19:42:53 2006 +0000
@@ -1,3 +1,9 @@
+2006-01-16  Mark D. Baushke  <mdb@gnu.org>
+
+	* mh-mime.el (mh-mime-display, mh-mm-inline-message): Fix use of
+	mm- functions for proper text=flowed handling. (SF #1273521)
+	(Patch contributed by Katsumi Yamaoka <yamaoka@jpl.org>.)
+
 2006-01-15  Bill Wohler  <wohler@newt.com>
 
 	* mh-e.el (mh-limit-map, mh-help-messages): Change keybinding of
--- a/lisp/mh-e/mh-mime.el	Mon Jan 16 12:08:35 2006 +0000
+++ b/lisp/mh-e/mh-mime.el	Mon Jan 16 19:42:53 2006 +0000
@@ -921,7 +921,10 @@
             ;; If needed dissect the current buffer
             (if pre-dissected-handles
                 (setq handles pre-dissected-handles)
-              (setq handles (or (mm-dissect-buffer nil) (mm-uu-dissect)))
+              (if (setq handles (mm-dissect-buffer nil))
+                  (when (fboundp 'mm-uu-dissect-text-parts)
+                    (mm-uu-dissect-text-parts handles))
+                (setq handles (mm-uu-dissect)))
               (setf (mh-mime-handles (mh-buffer-data))
                     (mm-merge-handles handles
                                       (mh-mime-handles (mh-buffer-data))))
@@ -1477,8 +1480,11 @@
         (mh-mime-display
          (or (gethash handle (mh-mime-handles-cache (mh-buffer-data)))
              (setf (gethash handle (mh-mime-handles-cache (mh-buffer-data)))
-                   (let ((handles (or (mm-dissect-buffer nil)
-                                      (mm-uu-dissect))))
+                   (let ((handles (mm-dissect-buffer nil)))
+                     (if handles
+                         (when (fboundp 'mm-uu-dissect-text-parts)
+                           (mm-uu-dissect-text-parts handles))
+                       (setq handles (mm-uu-dissect)))
                      (setf (mh-mime-handles (mh-buffer-data))
                            (mm-merge-handles
                             handles (mh-mime-handles (mh-buffer-data))))