X-Git-Url: http://cgit.sxemacs.org/?p=gnus;a=blobdiff_plain;f=lisp%2Fsmiley.el;h=403447f3963594d8b938c102f577c06a632f56ab;hp=df4b624ea1593507e878688944b1c63348f7f892;hb=b52037f4a9c6bee1ff556c22750e158da1208d4b;hpb=55c26cf1a9939dc7b28fcbab35f1d05d56d53242

diff --git a/lisp/smiley.el b/lisp/smiley.el
index df4b624ea..403447f39 100644
--- a/lisp/smiley.el
+++ b/lisp/smiley.el
@@ -1,6 +1,6 @@
 ;;; smiley.el --- displaying smiley faces
 
-;; Copyright (C) 2000-2012 Free Software Foundation, Inc.
+;; Copyright (C) 2000-2016 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