X-Git-Url: https://git.hcoop.net/bpt/emacs.git/blobdiff_plain/fec2107c58835163dc3b08c0a833a5072aa1fca9..70c0e6558277b7bcf2f88ea92a6270901e6a0acd:/lisp/gnus/smiley.el

diff --git a/lisp/gnus/smiley.el b/lisp/gnus/smiley.el
index cf23deb174..6a63f631ca 100644
--- a/lisp/gnus/smiley.el
+++ b/lisp/gnus/smiley.el
@@ -1,6 +1,6 @@
 ;;; smiley.el --- displaying smiley faces
 
-;; Copyright (C) 2000-2011 Free Software Foundation, Inc.
+;; Copyright (C) 2000-2014 Free Software Foundation, Inc.
 
 ;; Author: Dave Love <fx@gnu.org>
 ;; Keywords: news mail multimedia
@@ -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