Commit 296d197b authored by Julien Danjou's avatar Julien Danjou Committed by Katsumi Yamaoka
Browse files

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

parent 2f142cc5
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
......
......@@ -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))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment