projects
/
gnus
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* message.el (message-setup-1): Don't bind the constant -forbidden-properties.
[gnus]
/
lisp
/
smiley.el
diff --git
a/lisp/smiley.el
b/lisp/smiley.el
index
5276026
..
2f5c742
100644
(file)
--- a/
lisp/smiley.el
+++ b/
lisp/smiley.el
@@
-1,7
+1,6
@@
;;; smiley.el --- displaying smiley faces
;;; smiley.el --- displaying smiley faces
-;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+;; Copyright (C) 2000-2011 Free Software Foundation, Inc.
;; Author: Dave Love <fx@gnu.org>
;; Keywords: news mail multimedia
;; Author: Dave Love <fx@gnu.org>
;; Keywords: news mail multimedia
@@
-102,7
+101,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")
@@
-119,6
+119,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")))
@@
-196,8
+197,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
@@
-226,5
+227,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