diff options
| author | Mark D. Baushke <mdb@gnu.org> | 2006-01-16 19:42:53 +0000 |
|---|---|---|
| committer | Mark D. Baushke <mdb@gnu.org> | 2006-01-16 19:42:53 +0000 |
| commit | 9ac2e4e5236f040aa935860d5816da809bbd19e9 (patch) | |
| tree | f9f45107d436fac105721586e2afde0bd68e4d94 /lisp | |
| parent | 0814ca04aea186499b5cc6a1454b029b71f5a5a3 (diff) | |
| download | emacs-9ac2e4e5236f040aa935860d5816da809bbd19e9.tar.gz emacs-9ac2e4e5236f040aa935860d5816da809bbd19e9.tar.bz2 emacs-9ac2e4e5236f040aa935860d5816da809bbd19e9.zip | |
* mh-mime.el (mh-mime-display, mh-mm-inline-message): Fix use of mm-
functions for text=flowed. (SF #1273521)
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/mh-e/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/mh-e/mh-mime.el | 12 |
2 files changed, 15 insertions, 3 deletions
diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog index 23a0a2041a5..8ecaf76b5ae 100644 --- a/lisp/mh-e/ChangeLog +++ b/lisp/mh-e/ChangeLog @@ -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 diff --git a/lisp/mh-e/mh-mime.el b/lisp/mh-e/mh-mime.el index 0f2396d1804..f2eadd878b0 100644 --- a/lisp/mh-e/mh-mime.el +++ b/lisp/mh-e/mh-mime.el @@ -921,7 +921,10 @@ parsed and then displayed." ;; 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 @@ decoding the same message multiple times." (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)))) |