[Emacs-commit] emacs/lisp/mh-e ChangeLog mh-mime.el

[Mark D. Baushke]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Branch:         
Changes by:     Mark D. Baushke <address@hidden>        06/01/16 19:42:53

Modified files:
        lisp/mh-e      : ChangeLog mh-mime.el 

Log message:
        * mh-mime.el (mh-mime-display, mh-mm-inline-message): Fix use of mm-
        functions for text=flowed. (SF #1273521)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/emacs/lisp/mh-e/ChangeLog.diff?tr1=1.119&tr2=1.120&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/emacs/emacs/lisp/mh-e/mh-mime.el.diff?tr1=1.43&tr2=1.44&r1=text&r2=text

Patches:
Index: emacs/lisp/mh-e/ChangeLog
diff -u emacs/lisp/mh-e/ChangeLog:1.119 emacs/lisp/mh-e/ChangeLog:1.120
--- emacs/lisp/mh-e/ChangeLog:1.119     Mon Jan 16 05:41:26 2006
+++ emacs/lisp/mh-e/ChangeLog   Mon Jan 16 19:42:53 2006
@@ -1,3 +1,9 @@
+2006-01-16  Mark D. Baushke  <address@hidden>
+
+       * 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 <address@hidden>.)
+
 2006-01-15  Bill Wohler  <address@hidden>
 
        * mh-e.el (mh-limit-map, mh-help-messages): Change keybinding of
Index: emacs/lisp/mh-e/mh-mime.el
diff -u emacs/lisp/mh-e/mh-mime.el:1.43 emacs/lisp/mh-e/mh-mime.el:1.44
--- emacs/lisp/mh-e/mh-mime.el:1.43     Sun Jan 15 08:17:55 2006
+++ emacs/lisp/mh-e/mh-mime.el  Mon Jan 16 19:42:53 2006
@@ -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))))