diff options
| author | Julien Danjou <julien@danjou.info> | 2011-05-10 13:20:21 +0000 |
|---|---|---|
| committer | Katsumi Yamaoka <yamaoka@jpl.org> | 2011-05-10 13:20:21 +0000 |
| commit | 296d197b34bfedb9ae5de8ffd615cdc428e60b8a (patch) | |
| tree | 8b3592e6c213b9c212508e05718d237d144082b9 /lisp | |
| parent | 2f142cc515f795f22c96464d97b28a7d8226c578 (diff) | |
| download | emacs-296d197b34bfedb9ae5de8ffd615cdc428e60b8a.tar.gz emacs-296d197b34bfedb9ae5de8ffd615cdc428e60b8a.tar.bz2 emacs-296d197b34bfedb9ae5de8ffd615cdc428e60b8a.zip | |
shr.el (shr-put-color-1): Do not bug out when old-props is a face symbol and not a list.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/gnus/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/gnus/shr.el | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 5f7cd9f546b..657700a6343 100644 --- 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 da27edca6e5..bf5b06ccb56 100644 --- 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)) |