diff options
| -rw-r--r-- | 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 0a9af9ea634..b5450a82bdd 100644 --- a/lisp/gnus/smiley.el +++ b/lisp/gnus/smiley.el | |||
| @@ -58,19 +58,17 @@ | |||
| 58 | (defvar smiley-data-directory) | 58 | (defvar smiley-data-directory) |
| 59 | 59 | ||
| 60 | (defcustom smiley-style | 60 | (defcustom smiley-style |
| 61 | (if (or (and (fboundp 'face-attribute) | 61 | (if (and (fboundp 'face-attribute) |
| 62 | ;; In batch mode, attributes can be unspecified. | 62 | ;; In batch mode, attributes can be unspecified. |
| 63 | (condition-case nil | 63 | (condition-case nil |
| 64 | (>= (face-attribute 'default :height) 160) | 64 | (>= (face-attribute 'default :height) 160) |
| 65 | (error nil))) | 65 | (error nil))) |
| 66 | (and (fboundp 'face-height) | ||
| 67 | (>= (face-height 'default) 14))) | ||
| 68 | 'medium | 66 | 'medium |
| 69 | 'low-color) | 67 | 'low-color) |
| 70 | "Smiley style." | 68 | "Smiley style." |
| 71 | :type '(choice (const :tag "small, 3 colors" low-color) ;; 13x14 | 69 | :type '(choice (const :tag "small, 3 colors" low-color) ;; 13x14 |
| 72 | (const :tag "medium, ~10 colors" medium) ;; 16x16 | 70 | (const :tag "medium, ~10 colors" medium) ;; 16x16 |
| 73 | (const :tag "dull, grayscale" grayscale));; 14x14 | 71 | (const :tag "dull, grayscale" grayscale)) ;; 14x14 |
| 74 | :set (lambda (symbol value) | 72 | :set (lambda (symbol value) |
| 75 | (set-default symbol value) | 73 | (set-default symbol value) |
| 76 | (setq smiley-data-directory (smiley-directory)) | 74 | (setq smiley-data-directory (smiley-directory)) |