From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Sun, 14 Feb 2016 03:56:21 +0000 (+1100)
Subject: Remove compat code from smiley
X-Git-Tag: emacs-26.0.90~2559
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f322abc9452aded2ed462dc0d02e4bf41416e2d2;p=emacs.git

Remove compat code from smiley

* lisp/gnus/smiley.el (smiley-style): Remove compat code.
---

diff --git a/lisp/gnus/smiley.el b/lisp/gnus/smiley.el
index 0a9af9ea634..b5450a82bdd 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))