shr.el (shr-put-color-1): Do not bug out when old-props is a face symbol and not...

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 5f7cd9f546bcd31aa0a5d40b9e8f125c5c4ab8b4..657700a6343a2765e0d75e970b35ea88885fb406 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2011-05-10  Julien Danjou  <julien@danjou.info>
+
+       * shr.el (shr-put-color-1): Do not bug out when old-props is a face
+       symbol and not a list.
+
 2011-05-10  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * gnus-art.el (gnus-article-mode): Move binding of

diff --git a/lisp/gnus/shr.el b/lisp/gnus/shr.el
index da27edca6e5cf73a1dee3f225d0370425398c9eb..bf5b06ccb5602d50448a7ddf137bac777a3af132 100644 (file)
--- a/lisp/gnus/shr.el
+++ b/lisp/gnus/shr.el
@@ -716,7 +716,8 @@ ones, in case fg and bg are nil."
 
 (defun shr-put-color-1 (start end type color)
   (let* ((old-props (get-text-property start 'face))
-        (do-put (not (memq type old-props)))
+        (do-put (and (listp old-props)
+                      (not (memq type old-props))))
         change)
     (while (< start end)
       (setq change (next-single-property-change start 'face nil end))
@@ -724,7 +725,8 @@ ones, in case fg and bg are nil."
        (put-text-property start change 'face
                           (nconc (list type color) old-props)))
       (setq old-props (get-text-property change 'face))
-      (setq do-put (not (memq type old-props)))
+      (setq do-put (and (listp old-props)
+                        (not (memq type old-props))))
       (setq start change))
     (when (and do-put
               (> end start))