diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/gnus/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/gnus/smiley.el | 5 |
2 files changed, 8 insertions, 1 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 733f1d26510..1f1b46c8532 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,7 @@ +2013-01-16 Glenn Morris <rgm@gnu.org> + + * smiley.el (smiley-style): Make the file loadable in batch mode. + 2013-01-15 Stefan Monnier <monnier@iro.umontreal.ca> * nnimap.el (nnimap-keepalive): Don't throw an error if there's no more diff --git a/lisp/gnus/smiley.el b/lisp/gnus/smiley.el index 6381f5bf9d9..eb71134457c 100644 --- a/lisp/gnus/smiley.el +++ b/lisp/gnus/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 |