Update copyright year to 2016

[gnus] / lisp / smiley.el

diff --git a/lisp/smiley.el b/lisp/smiley.el
index df4b624..403447f 100644 (file)
--- a/lisp/smiley.el
+++ b/lisp/smiley.el
@@ -1,6 +1,6 @@
 ;;; smiley.el --- displaying smiley faces
 
 ;;; 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
 
 ;; Author: Dave Love <fx@gnu.org>
 ;; Keywords: news mail multimedia


@@ -59,7 +59,10 @@
 
 (defcustom smiley-style
   (if (or (and (fboundp 'face-attribute)
 
 (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
          (and (fboundp 'face-height)
               (>= (face-height 'default) 14)))
       'medium