diff options
| author | Lars Ingebrigtsen <larsi@gnus.org> | 2020-08-18 23:15:09 +0200 |
|---|---|---|
| committer | Lars Ingebrigtsen <larsi@gnus.org> | 2020-08-18 23:19:09 +0200 |
| commit | 1a3105106900157337fda085c5bc534582af454d (patch) | |
| tree | 1a53dbc55ba3cef5d3d8206764e7c1fe982b1156 | |
| parent | ace7eeb505a2bc49a73be1736421ab9174031f7a (diff) | |
| download | emacs-1a3105106900157337fda085c5bc534582af454d.tar.gz | |
Remove some compat code from smiley.el
* lisp/gnus/smiley.el (smiley-style): face-attribute is always defined.
| -rw-r--r-- | lisp/gnus/smiley.el | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/lisp/gnus/smiley.el b/lisp/gnus/smiley.el index d41f32801ee..5504a520783 100644 --- a/lisp/gnus/smiley.el +++ b/lisp/gnus/smiley.el @@ -56,14 +56,11 @@ (defvar smiley-data-directory) -(defcustom smiley-style - (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) +;; In batch mode, attributes can be unspecified. +(defcustom smiley-style (if (ignore-errors + (>= (face-attribute 'default :height) 160)) + 'medium + 'low-color) "Smiley style." :type '(choice (const :tag "small, 3 colors" low-color) ;; 13x14 (const :tag "medium, ~10 colors" medium) ;; 16x16 |