projects
/
gnus
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from emacs--devo--0, emacs--rel--22
[gnus]
/
lisp
/
smiley.el
diff --git
a/lisp/smiley.el
b/lisp/smiley.el
index
c26c67c
..
3847603
100644
(file)
--- a/
lisp/smiley.el
+++ b/
lisp/smiley.el
@@
-1,7
+1,7
@@
;;; 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
Free Software Foundation, Inc.
;; Author: Dave Love <fx@gnu.org>
;; Keywords: news mail multimedia
;; Author: Dave Love <fx@gnu.org>
;; Keywords: news mail multimedia
@@
-10,7
+10,7
@@
;; 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
;; 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
-;; the Free Software Foundation; either version
2
, or (at your option)
+;; the Free Software Foundation; either version
3
, or (at your option)
;; any later version.
;; GNU Emacs is distributed in the hope that it will be useful,
;; any later version.
;; GNU Emacs is distributed in the hope that it will be useful,
@@
-63,7
+63,7
@@
(defcustom smiley-style
(if (or (and (fboundp 'face-attribute)
(>= (face-attribute 'default :height) 160))
(defcustom smiley-style
(if (or (and (fboundp 'face-attribute)
(>= (face-attribute 'default :height) 160))
- (and (fbound 'face-height)
+ (and (fbound
p
'face-height)
(>= (face-height 'default) 14)))
'medium
'low-color)
(>= (face-height 'default) 14)))
'medium
'low-color)
@@
-76,7
+76,7
@@
(setq smiley-data-directory (smiley-directory))
(smiley-update-cache))
:initialize 'custom-initialize-default
(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
@@
-110,10
+110,10
@@
is nil, use `smiley-style'."
("\\(:-|\\)\\W" 1 "indifferent")
("\\(:-[/\\]\\)\\W" 1 "wry")
("\\(:-(\\)\\W" 1 "sad")
("\\(:-|\\)\\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"))
@@
-228,5
+228,5
@@
With arg, turn displaying on if and only if arg is positive."
(provide 'smiley)
(provide 'smiley)
-;;
;
arch-tag: 5beb161b-4321-40af-8ac9-876afb8ee818
+;; arch-tag: 5beb161b-4321-40af-8ac9-876afb8ee818
;;; smiley.el ends here
;;; smiley.el ends here