[Emacs-diffs] /srv/bzr/emacs/trunk r104187: shr.el (shr-put-color-1): Do not bug out when old-props is a face symbol and not a list.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 104187
author: Julien Danjou <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Tue 2011-05-10 13:20:21 +0000
message:
  shr.el (shr-put-color-1): Do not bug out when old-props is a face symbol and 
not a list.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/shr.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2011-05-10 07:30:49 +0000
+++ b/lisp/gnus/ChangeLog       2011-05-10 13:20:21 +0000
@@ -1,3 +1,8 @@
+2011-05-10  Julien Danjou  <address@hidden>
+
+       * 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  <address@hidden>
 
        * gnus-art.el (gnus-article-mode): Move binding of

=== modified file 'lisp/gnus/shr.el'
--- a/lisp/gnus/shr.el  2011-05-10 03:14:44 +0000
+++ b/lisp/gnus/shr.el  2011-05-10 13:20:21 +0000
@@ -716,7 +716,8 @@
 
 (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 @@
        (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))