projects
/
gnus
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Implement nnimap-request-newgroups.
[gnus]
/
lisp
/
smiley.el
diff --git
a/lisp/smiley.el
b/lisp/smiley.el
index
6e0227f
..
afffc64
100644
(file)
--- a/
lisp/smiley.el
+++ b/
lisp/smiley.el
@@
-1,27
+1,25
@@
;;; smiley.el --- displaying smiley faces
;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
;;; smiley.el --- displaying smiley faces
;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
-;; 2005, 2006 Free Software Foundation, Inc.
+;; 2005, 2006
, 2007, 2008, 2009, 2010
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 2, 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:
@@
-58,27
+56,25
@@
"Turn :-)'s into real images."
:group 'gnus-visual)
"Turn :-)'s into real images."
:group 'gnus-visual)
-(defcustom smiley-data-directory (smiley-directory)
- "*Location of the smiley faces files."
- :set (lambda (symbol value)
- (set-default symbol value)
- (smiley-update-cache))
- :initialize 'custom-initialize-default
- :type 'directory
- :group 'smiley)
+(defvar smiley-data-directory)
-;; Maybe this should go.
-(defcustom smiley-style 'low-color
+(defcustom smiley-style
+ (if (or (and (fboundp 'face-attribute)
+ (>= (face-attribute 'default :height) 160))
+ (and (fboundp 'face-height)
+ (>= (face-height 'default) 14)))
+ 'medium
+ 'low-color)
"Smiley style."
"Smiley style."
- :type '(choice (const :tag "small, 3 colors" low-color)
- (const :tag "medium, ~10 colors" medium)
- (const :tag "dull, grayscale" grayscale))
+ :type '(choice (const :tag "small, 3 colors" low-color)
;; 13x14
+ (const :tag "medium, ~10 colors" medium)
;; 16x16
+ (const :tag "dull, grayscale" grayscale))
;; 14x14
:set (lambda (symbol value)
(set-default symbol value)
(setq smiley-data-directory (smiley-directory))
(smiley-update-cache))
:initialize 'custom-initialize-default
:set (lambda (symbol value)
(set-default symbol value)
(setq smiley-data-directory (smiley-directory))
(smiley-update-cache))
:initialize 'custom-initialize-default
- :version "23.
0
" ;; No Gnus
+ :version "23.
1
" ;; No Gnus
:group 'smiley)
;; For compatibility, honor the variable `smiley-data-directory' if the user
:group 'smiley)
;; For compatibility, honor the variable `smiley-data-directory' if the user
@@
-95,18
+91,28
@@
is nil, use `smiley-style'."
((eq smiley-style 'medium) "/medium")
((eq smiley-style 'grayscale) "/grayscale")))))
((eq smiley-style 'medium) "/medium")
((eq smiley-style 'grayscale) "/grayscale")))))
+(defcustom smiley-data-directory (smiley-directory)
+ "*Location of the smiley faces files."
+ :set (lambda (symbol value)
+ (set-default symbol value)
+ (smiley-update-cache))
+ :initialize 'custom-initialize-default
+ :type 'directory
+ :group 'smiley)
+
;; 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 "wry")
("\\(:-(\\)\\W" 1 "sad")
("\\(:-]\\)\\W" 1 "forced")
("\\(8-)\\)\\W" 1 "braindamaged")
("\\(:-|\\)\\W" 1 "indifferent")
("\\(:-[/\\]\\)\\W" 1 "wry")
("\\(:-(\\)\\W" 1 "sad")
+ ("\\(X-)\\)\\W" 1 "dead")
("\\(:-{\\)\\W" 1 "frown")
("\\(>:-)\\)\\W" 1 "evil")
("\\(;-(\\)\\W" 1 "cry")
("\\(:-{\\)\\W" 1 "frown")
("\\(>:-)\\)\\W" 1 "evil")
("\\(;-(\\)\\W" 1 "cry")
- ("\\(X-)\\)\\W" 1 "dead")
("\\(:-D\\)\\W" 1 "grin")
;; "smile" must be come after "evil"
("\\(\\^?:-?)\\)\\W" 1 "smile"))
("\\(:-D\\)\\W" 1 "grin")
;; "smile" must be come after "evil"
("\\(\\^?:-?)\\)\\W" 1 "smile"))
@@
-114,6
+120,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")))
@@
-191,8
+198,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
@@
-221,5
+228,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