Remove some compat code from smiley.el

* lisp/gnus/smiley.el (smiley-style): face-attribute is always defined.

diff --git a/lisp/gnus/smiley.el b/lisp/gnus/smiley.el
index d41f32801eebd8c489f46a6d7b31b17894e38ae2..5504a5207836737516c7185a7a2bcd0dc80d6fb5 100644 (file)
--- a/lisp/gnus/smiley.el
+++ b/lisp/gnus/smiley.el
@@ -56,14 +56,11 @@
 
 (defvar smiley-data-directory)
 
-(defcustom smiley-style
-  (if (and (fboundp 'face-attribute)
-          ;; In batch mode, attributes can be unspecified.
-          (condition-case nil
-              (>= (face-attribute 'default :height) 160)
-            (error nil)))
-      'medium
-    'low-color)
+;; In batch mode, attributes can be unspecified.
+(defcustom smiley-style (if (ignore-errors
+                             (>= (face-attribute 'default :height) 160))
+                           'medium
+                         'low-color)
   "Smiley style."
   :type '(choice (const :tag "small, 3 colors" low-color)  ;; 13x14
                 (const :tag "medium, ~10 colors" medium)  ;; 16x16