diff options
| author | Wolfgang Jenkner <wjenkner@inode.at> | 2012-12-27 22:51:46 +0000 |
|---|---|---|
| committer | Katsumi Yamaoka <yamaoka@jpl.org> | 2012-12-27 22:51:46 +0000 |
| commit | 19693cc1740ff2f7edda55b8433652a8ba436e57 (patch) | |
| tree | bfc601964591638c2fe3cf66809130da55c3a13f | |
| parent | 313f39aa03cc40ddc4faea08636c74bfa52ec099 (diff) | |
| download | emacs-19693cc1740ff2f7edda55b8433652a8ba436e57.tar.gz | |
Gnus: Avoid `Invalid face reference: nil' messages
| -rw-r--r-- | lisp/gnus/ChangeLog | 10 | ||||
| -rw-r--r-- | lisp/gnus/gnus-spec.el | 2 | ||||
| -rw-r--r-- | lisp/gnus/gnus-util.el | 2 |
3 files changed, 12 insertions, 2 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index be531be941e..4450dde0cd8 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,13 @@ +2012-12-27 Wolfgang Jenkner <wjenkner@inode.at> + + * gnus-spec.el (gnus-face-face-function): Don't use nil as no-op face + place holder since this gives `Invalid face reference: nil' messages. + Use the `default' face instead. It has the same effect here, even + though it is not no-op. + + * gnus-util.el + (gnus-put-text-property-excluding-characters-with-faces): Similarly. + 2012-12-27 Lars Ingebrigtsen <larsi@gnus.org> * gnus-msg.el (gnus-summary-resend-message): Don't bug out on diff --git a/lisp/gnus/gnus-spec.el b/lisp/gnus/gnus-spec.el index 22d4627bf28..0b5203d9ea0 100644 --- a/lisp/gnus/gnus-spec.el +++ b/lisp/gnus/gnus-spec.el @@ -270,7 +270,7 @@ Return a list of updated types." ;; Delay consing the value of the `face' property until ;; `gnus-add-text-properties' runs, since it will be modified ;; by `gnus-put-text-property-excluding-characters-with-faces'. - (list ',(symbol-value (intern (format "gnus-face-%d" type))) nil) + (list ',(symbol-value (intern (format "gnus-face-%d" type))) 'default) ;; Redundant now, but still convenient. '(gnus-face t))))) diff --git a/lisp/gnus/gnus-util.el b/lisp/gnus/gnus-util.el index 705a9e0debf..fb218e5cf75 100644 --- a/lisp/gnus/gnus-util.el +++ b/lisp/gnus/gnus-util.el @@ -875,7 +875,7 @@ Otherwise, do nothing." (let ((stop (next-single-property-change beg 'face nil end))) (if (get-text-property beg 'gnus-face) (when (eq prop 'face) - (setcar (cdr (get-text-property beg 'face)) val)) + (setcar (cdr (get-text-property beg 'face)) (or val 'default))) (inline (gnus-put-text-property beg stop prop val))) (setq beg stop)))) |