[gnus git] branch master updated: m0-5-255-g6d29e36 =1= smiley.el (smiley-style): Make the file loadable in batch mode

       via  6d29e36b0b02c0521173c979521ade783c671a1f (commit)
      from  31918709d491d39e0d2e18867178b6479ab63b65 (commit)


- Log -----------------------------------------------------------------
commit 6d29e36b0b02c0521173c979521ade783c671a1f
Author: Glenn Morris <[email protected]>
Date:   Wed Jan 16 11:40:48 2013 +0000

    smiley.el (smiley-style): Make the file loadable in batch mode

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index eb6b91c..71f45bf 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2013-01-16  Glenn Morris  <[email protected]>
+
+	* smiley.el (smiley-style): Make the file loadable in batch mode.
+
 2013-01-15  Stefan Monnier  <[email protected]>
 
 	* nnimap.el (nnimap-keepalive): Don't throw an error if there's no more
diff --git a/lisp/smiley.el b/lisp/smiley.el
index 6381f5b..eb71134 100644
--- a/lisp/smiley.el
+++ b/lisp/smiley.el
@@ -59,7 +59,10 @@
 
 (defcustom smiley-style
   (if (or (and (fboundp 'face-attribute)
-	       (>= (face-attribute 'default :height) 160))
+	       ;; In batch mode, attributes can be unspecified.
+	       (condition-case nil
+		   (>= (face-attribute 'default :height) 160)
+		 (error nil)))
 	  (and (fboundp 'face-height)
 	       (>= (face-height 'default) 14)))
       'medium

-----------------------------------------------------------------------
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 |    4 ++++
 lisp/smiley.el |    5 ++++-
 2 files changed, 8 insertions(+), 1 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