[Emacs-diffs] /srv/bzr/emacs/trunk r111355: Gnus: Avoid `Invalid face reference: nil' messages

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 111355
author: Wolfgang Jenkner <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Thu 2012-12-27 22:51:46 +0000
message:
  Gnus: Avoid `Invalid face reference: nil' messages
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/gnus-spec.el
  lisp/gnus/gnus-util.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2012-12-27 14:58:36 +0000
+++ b/lisp/gnus/ChangeLog       2012-12-27 22:51:46 +0000
@@ -1,3 +1,13 @@
+2012-12-27  Wolfgang Jenkner  <address@hidden>
+
+       * 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  <address@hidden>
 
        * gnus-msg.el (gnus-summary-resend-message): Don't bug out on

=== modified file 'lisp/gnus/gnus-spec.el'
--- a/lisp/gnus/gnus-spec.el    2012-12-25 22:12:59 +0000
+++ b/lisp/gnus/gnus-spec.el    2012-12-27 22:51:46 +0000
@@ -270,7 +270,7 @@
           ;; 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)))))
 

=== modified file 'lisp/gnus/gnus-util.el'
--- a/lisp/gnus/gnus-util.el    2012-12-26 13:58:54 +0000
+++ b/lisp/gnus/gnus-util.el    2012-12-27 22:51:46 +0000
@@ -875,7 +875,7 @@
     (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))))