Autoload epa-select-keys when compiling.

[gnus] / lisp / smiley.el

diff --git a/lisp/smiley.el b/lisp/smiley.el
index 6e0227f..e2a1b85 100644 (file)
--- a/lisp/smiley.el
+++ b/lisp/smiley.el
@@ -58,21 +58,19 @@
   "Turn :-)'s into real images."
   :group 'gnus-visual)
 
-(defcustom smiley-data-directory (smiley-directory)
-  "*Location of the smiley faces files."
-  :set (lambda (symbol value)
-        (set-default symbol value)
-        (smiley-update-cache))
-  :initialize 'custom-initialize-default
-  :type 'directory
-  :group 'smiley)
-
-;; Maybe this should go.
-(defcustom smiley-style 'low-color
+(defvar smiley-data-directory)
+
+(defcustom smiley-style
+  (if (or (and (fboundp 'face-attribute)
+              (>= (face-attribute 'default :height) 160))
+         (and (fboundp 'face-height)
+              (>= (face-height 'default) 14)))
+      'medium
+    'low-color)
   "Smiley style."
-  :type '(choice (const :tag "small, 3 colors" low-color)
-                (const :tag "medium, ~10 colors" medium)
-                (const :tag "dull, grayscale" grayscale))
+  :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))
@@ -95,6 +93,15 @@ is nil, use `smiley-style'."
                 ((eq smiley-style 'medium) "/medium")
                 ((eq smiley-style 'grayscale) "/grayscale")))))
 
+(defcustom smiley-data-directory (smiley-directory)
+  "*Location of the smiley faces files."
+  :set (lambda (symbol value)
+        (set-default symbol value)
+        (smiley-update-cache))
+  :initialize 'custom-initialize-default
+  :type 'directory
+  :group 'smiley)
+
 ;; The XEmacs version has a baroque, if not rococo, set of these.
 (defcustom smiley-regexp-alist
   '(("\\(;-?)\\)\\W" 1 "blink")