Gnus: Avoid `Invalid face reference: nil' messages

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index be531be941e8b335a9c0c665427429613ffb9a2c..4450dde0cd8cd33b6097c19ad58492b1de32e1a5 100644 (file)
--- 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 22d4627bf284049fda4b7e73da3c6171e747dbf2..0b5203d9ea0d6b6af05342f692d0986dbe5f3904 100644 (file)
--- 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 705a9e0debf90bd76f01ed1f440db1691ecae8f7..fb218e5cf75fa633c5a3082b66dfdfe8d39d1015 100644 (file)
--- 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))))