projects
/
gnus
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Quoting fixes
[gnus]
/
lisp
/
smiley.el
diff --git
a/lisp/smiley.el
b/lisp/smiley.el
index
2f5c742
..
8b8cad7
100644
(file)
--- a/
lisp/smiley.el
+++ b/
lisp/smiley.el
@@
-1,6
+1,6
@@
;;; smiley.el --- displaying smiley faces
;;; smiley.el --- displaying smiley faces
-;; Copyright (C) 2000-201
1
Free Software Foundation, Inc.
+;; Copyright (C) 2000-201
5
Free Software Foundation, Inc.
;; Author: Dave Love <fx@gnu.org>
;; Keywords: news mail multimedia
;; Author: Dave Love <fx@gnu.org>
;; Keywords: news mail multimedia
@@
-59,7
+59,10
@@
(defcustom smiley-style
(if (or (and (fboundp 'face-attribute)
(defcustom smiley-style
(if (or (and (fboundp 'face-attribute)
- (>= (face-attribute 'default :height) 160))
+ ;; 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)))
'medium
(and (fboundp 'face-height)
(>= (face-height 'default) 14)))
'medium
@@
-133,9
+136,11
@@
regexp to replace with IMAGE. IMAGE is the name of an image file in
(let ((types (list "pbm")))
(when (gnus-image-type-available-p 'xpm)
(push "xpm" types))
(let ((types (list "pbm")))
(when (gnus-image-type-available-p 'xpm)
(push "xpm" types))
+ (when (gnus-image-type-available-p 'gif)
+ (push "gif" types))
types)
"*List of suffixes on smiley file names to try."
types)
"*List of suffixes on smiley file names to try."
- :version "2
2
.1"
+ :version "2
4
.1"
:type '(repeat string)
:group 'smiley)
:type '(repeat string)
:group 'smiley)