emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] /srv/bzr/emacs/trunk r111535: * lisp/gnus/smiley.el (smile


From: Glenn Morris
Subject: [Emacs-diffs] /srv/bzr/emacs/trunk r111535: * lisp/gnus/smiley.el (smiley-style): Make the file loadable in batch mode.
Date: Tue, 15 Jan 2013 21:46:25 -0500
User-agent: Bazaar (2.5.0)

------------------------------------------------------------
revno: 111535
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Tue 2013-01-15 21:46:25 -0500
message:
  * lisp/gnus/smiley.el (smiley-style): Make the file loadable in batch mode.
  Not likely to be very useful, of course, but helps with automated testing.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/smiley.el
=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2013-01-15 04:26:28 +0000
+++ b/lisp/gnus/ChangeLog       2013-01-16 02:46:25 +0000
@@ -1,3 +1,7 @@
+2013-01-16  Glenn Morris  <address@hidden>
+
+       * smiley.el (smiley-style): Make the file loadable in batch mode.
+
 2013-01-15  Stefan Monnier  <address@hidden>
 
        * nnimap.el (nnimap-keepalive): Don't throw an error if there's no more

=== modified file 'lisp/gnus/smiley.el'
--- a/lisp/gnus/smiley.el       2013-01-01 09:11:05 +0000
+++ b/lisp/gnus/smiley.el       2013-01-16 02:46:25 +0000
@@ -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


reply via email to

[Prev in Thread] Current Thread [Next in Thread]