master 1a31051 5/7: Remove some compat code from smiley.el

[Lars Ingebrigtsen]

branch: master
commit 1a3105106900157337fda085c5bc534582af454d
Author: Lars Ingebrigtsen <larsi@gnus.org>
Commit: Lars Ingebrigtsen <larsi@gnus.org>

    Remove some compat code from smiley.el
    
    * lisp/gnus/smiley.el (smiley-style): face-attribute is always defined.
---
 lisp/gnus/smiley.el | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/lisp/gnus/smiley.el b/lisp/gnus/smiley.el
index d41f328..5504a52 100644
--- 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