* mm-view.el (mm-inline-text-html): Don't bug out on multipart messages

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 71db4a0..55c1671 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-07-06  Lars Ingebrigtsen  <larsi@gnus.org>
+
+       * mm-view.el (mm-inline-text-html): Don't bug out on multipart messages
+       (bug#13762).
+
 2013-07-05  David Kastrup  <dak@gnu.org>
 
        * auth-source.el (auth-source-netrc-parse-one): Allow empty strings in

diff --git a/lisp/mm-view.el b/lisp/mm-view.el
index b1cba27..9512a41 100644 (file)
--- a/lisp/mm-view.el
+++ b/lisp/mm-view.el
@@ -419,16 +419,18 @@
        (buffer-string)))))
 
 (defun mm-inline-text-html (handle)
-  (let* ((func mm-text-html-renderer)
-        (entry (assq func mm-text-html-renderer-alist))
-        (inhibit-read-only t))
-    (if entry
-       (setq func (cdr entry)))
-    (cond
-     ((functionp func)
-      (funcall func handle))
-     (t
-      (apply (car func) handle (cdr func))))))
+  (if (stringp (car handle))
+      (mapcar 'mm-inline-text-html (cdr handle))
+    (let* ((func mm-text-html-renderer)
+          (entry (assq func mm-text-html-renderer-alist))
+          (inhibit-read-only t))
+      (if entry
+         (setq func (cdr entry)))
+      (cond
+       ((functionp func)
+       (funcall func handle))
+       (t
+       (apply (car func) handle (cdr func)))))))
 
 (defun mm-inline-text-vcard (handle)
   (let ((inhibit-read-only t))