Merge from origin/emacs-25

[gnu-emacs] / lisp / gnus / smiley.el

diff --git a/lisp/gnus/smiley.el b/lisp/gnus/smiley.el
index 6a63f631ca1e33e90688f518d0bca6c757a29002..b5450a82bdd4bb86ade2ed41806bd97d835e486d 100644 (file)
--- a/lisp/gnus/smiley.el
+++ b/lisp/gnus/smiley.el
@@ -1,6 +1,6 @@
 ;;; smiley.el --- displaying smiley faces
 
-;; Copyright (C) 2000-2014 Free Software Foundation, Inc.
+;; Copyright (C) 2000-2016 Free Software Foundation, Inc.
 
 ;; Author: Dave Love <fx@gnu.org>
 ;; Keywords: news mail multimedia
@@ -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))
@@ -179,7 +177,7 @@ regexp to replace with IMAGE.  IMAGE is the name of an image file in
   "Replace in the region `smiley-regexp-alist' matches with corresponding images.
 A list of images is returned."
   (interactive "r")
-  (when (gnus-graphic-display-p)
+  (when (display-graphic-p)
     (unless smiley-cached-regexp-alist
       (smiley-update-cache))
     (save-excursion