[Emacs-diffs] master f322abc 08/12: Remove compat code from smiley

[Lars Ingebrigtsen]

branch: master
commit f322abc9452aded2ed462dc0d02e4bf41416e2d2
Author: Lars Ingebrigtsen <address@hidden>
Commit: Lars Ingebrigtsen <address@hidden>

    Remove compat code from smiley
    
    * lisp/gnus/smiley.el (smiley-style): Remove compat code.
---
 lisp/gnus/smiley.el |   18 ++++++++----------
 1 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/lisp/gnus/smiley.el b/lisp/gnus/smiley.el
index 0a9af9e..b5450a8 100644
--- a/lisp/gnus/smiley.el
+++ b/lisp/gnus/smiley.el
@@ -58,19 +58,17 @@
 (defvar smiley-data-directory)
 
 (defcustom smiley-style
-  (if (or (and (fboundp 'face-attribute)
-              ;; 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)))
+  (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)
   "Smiley style."
-  :type '(choice (const :tag "small, 3 colors" low-color) ;; 13x14
-                (const :tag "medium, ~10 colors" medium) ;; 16x16
-                (const :tag "dull, grayscale" grayscale));; 14x14
+  :type '(choice (const :tag "small, 3 colors" low-color)  ;; 13x14
+                (const :tag "medium, ~10 colors" medium)  ;; 16x16
+                (const :tag "dull, grayscale" grayscale)) ;; 14x14
   :set (lambda (symbol value)
         (set-default symbol value)
         (setq smiley-data-directory (smiley-directory))