(smiley-style): Default to `medium' if using a large

font.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index eba4216..cec6d42 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2006-04-15  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+       * smiley.el (smiley-style): Default to `medium' if using a large
+       font.
+
        * gnus-sum.el (unmorse-region): Remove autoload, because morse.el
        does it itself.
 

diff --git a/lisp/smiley.el b/lisp/smiley.el
index f0249fa..c26c67c 100644 (file)
--- a/lisp/smiley.el
+++ b/lisp/smiley.el
@@ -60,11 +60,17 @@
 
 (defvar smiley-data-directory)
 
-(defcustom smiley-style 'low-color
+(defcustom smiley-style
+  (if (or (and (fboundp 'face-attribute)
+              (>= (face-attribute 'default :height) 160))
+         (and (fbound '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))