projects
/
gnus
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Apply patch by Katsumi Yamaoka <yamaoka@jpl.org>
[gnus]
/
lisp
/
smiley.el
diff --git
a/lisp/smiley.el
b/lisp/smiley.el
index
7937679
..
403447f
100644
(file)
--- a/
lisp/smiley.el
+++ b/
lisp/smiley.el
@@
-1,27
+1,24
@@
;;; smiley.el --- displaying smiley faces
;;; smiley.el --- displaying smiley faces
-;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;; Copyright (C) 2000-2016 Free Software Foundation, Inc.
;; Author: Dave Love <fx@gnu.org>
;; Keywords: news mail multimedia
;; This file is part of GNU Emacs.
;; Author: Dave Love <fx@gnu.org>
;; Keywords: news mail multimedia
;; This file is part of GNU Emacs.
-;; GNU Emacs is free software
;
you can redistribute it and/or modify
+;; GNU Emacs is free software
:
you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation
; either version 3, or (at your option)
-;; any later version.
+;; the Free Software Foundation
, either version 3 of the License, or
+;;
(at your option)
any later version.
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
;;; Commentary:
@@
-62,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
@@
-104,7
+104,8
@@
is nil, use `smiley-style'."
;; The XEmacs version has a baroque, if not rococo, set of these.
(defcustom smiley-regexp-alist
;; The XEmacs version has a baroque, if not rococo, set of these.
(defcustom smiley-regexp-alist
- '(("\\(;-?)\\)\\W" 1 "blink")
+ '(("\\(;-)\\)\\W" 1 "blink")
+ ("[^;]\\(;)\\)\\W" 1 "blink")
("\\(:-]\\)\\W" 1 "forced")
("\\(8-)\\)\\W" 1 "braindamaged")
("\\(:-|\\)\\W" 1 "indifferent")
("\\(:-]\\)\\W" 1 "forced")
("\\(8-)\\)\\W" 1 "braindamaged")
("\\(:-|\\)\\W" 1 "indifferent")
@@
-121,6
+122,7
@@
is nil, use `smiley-style'."
The elements are (REGEXP MATCH IMAGE), where MATCH is the submatch in
regexp to replace with IMAGE. IMAGE is the name of an image file in
`smiley-data-directory'."
The elements are (REGEXP MATCH IMAGE), where MATCH is the submatch in
regexp to replace with IMAGE. IMAGE is the name of an image file in
`smiley-data-directory'."
+ :version "24.1"
:type '(repeat (list regexp
(integer :tag "Regexp match number")
(string :tag "Image name")))
:type '(repeat (list regexp
(integer :tag "Regexp match number")
(string :tag "Image name")))
@@
-134,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)
@@
-198,8
+202,8
@@
A list of images is returned."
;;;###autoload
(defun smiley-buffer (&optional buffer)
;;;###autoload
(defun smiley-buffer (&optional buffer)
- "Run `smiley-region' at the
buffer
, specified in the argument or
-interactively.
If there's no argument, do it at the current buffer
"
+ "Run `smiley-region' at the
BUFFER
, specified in the argument or
+interactively.
If there's no argument, do it at the current buffer.
"
(interactive "bBuffer to run smiley-region: ")
(save-excursion
(if buffer
(interactive "bBuffer to run smiley-region: ")
(save-excursion
(if buffer
@@
-228,5
+232,4
@@
With arg, turn displaying on if and only if arg is positive."
(provide 'smiley)
(provide 'smiley)
-;;; arch-tag: 5beb161b-4321-40af-8ac9-876afb8ee818
;;; smiley.el ends here
;;; smiley.el ends here