[gnus git] branch master updated: m0-5-235-g25b91b5 =1= Avoid `Invalid face reference: nil' messages.

       via  25b91b54d96538d15edb905723d5322fe967d67d (commit)
      from  56144f96a2ab04718c8ed5dd84d8fb315847480d (commit)


- Log -----------------------------------------------------------------
commit 25b91b54d96538d15edb905723d5322fe967d67d
Author: Wolfgang Jenkner <[email protected]>
Date:   Thu Dec 27 18:18:03 2012 +0100

    Avoid `Invalid face reference: nil' messages.
    
    * 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.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9ef0174..9ff2c02 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2012-12-27  Wolfgang Jenkner  <[email protected]>
+
+	* 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  <[email protected]>
 
 	* gnus-msg.el (gnus-summary-resend-message): Don't bug out on
diff --git a/lisp/gnus-spec.el b/lisp/gnus-spec.el
index 22d4627..0b5203d 100644
--- a/lisp/gnus-spec.el
+++ b/lisp/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-util.el b/lisp/gnus-util.el
index 705a9e0..fb218e5 100644
--- a/lisp/gnus-util.el
+++ b/lisp/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))))

-----------------------------------------------------------------------
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we listed those
revisions in full, above.

Summary of changes:
 lisp/ChangeLog    |   10 ++++++++++
 lisp/gnus-spec.el |    2 +-
 lisp/gnus-util.el |    2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnus Project".

The branch, master has been updated


hooks/post-receive
-- 
Gnus Project