2001-10-29 Per Abrahamsen <abraham@dina.kvl.dk>

	* etc/smilies/sad.pbm: New bitmap.
	* etc/smilies/blink.pbm: Ditto.
	Contributed by Kim F. Storm <storm@cua.dk>.

2001-10-29  Per Abrahamsen  <abraham@dina.kvl.dk>

	* smiley-ems.el (smiley-regexp-alist): Add support for sad and
	ironic smilies.

[ Kim F. Storm has cvs write permission to Emacs, so I assume he has
  signed all relevant papers. ]

diff --git a/ChangeLog b/ChangeLog
index b668882..0c34ec4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-10-29  Per Abrahamsen  <abraham@dina.kvl.dk>
+
+       * etc/smilies/sad.pbm: New bitmap.
+       * etc/smilies/blink.pbm: Ditto.
+       Contributed by Kim F. Storm <storm@cua.dk>.
+
 2001-10-19  Kai Gro\e,A_\e(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
        From Frank Schmitt <ich@Frank-Schmitt.net>. 
        

diff --git a/etc/smilies/blink.pbm b/etc/smilies/blink.pbm
new file mode 100644 (file)
index 0000000..6c7531b
Binary files /dev/null and b/etc/smilies/blink.pbm differ

diff --git a/etc/smilies/sad.pbm b/etc/smilies/sad.pbm
new file mode 100644 (file)
index 0000000..892e343
Binary files /dev/null and b/etc/smilies/sad.pbm differ

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index de284ea..62a74d0 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-29  Per Abrahamsen  <abraham@dina.kvl.dk>
+
+       * smiley-ems.el (smiley-regexp-alist): Add support for sad and
+       ironic smilies.
+
 2001-10-27  Simon Josefsson  <jas@extundo.com>
 
        * message.el (message-indent-citation): Don't add trailing

diff --git a/lisp/smiley-ems.el b/lisp/smiley-ems.el
index dd1a183..3b4f972 100644 (file)
--- a/lisp/smiley-ems.el
+++ b/lisp/smiley-ems.el
@@ -1,6 +1,6 @@
 ;;; smiley-ems.el --- displaying smiley faces
 
-;; Copyright (C) 2000 Free Software Foundation, Inc.
+;; Copyright (C) 2000, 2001 Free Software Foundation, Inc.
 
 ;; Author: Dave Love <fx@gnu.org>
 ;; Keywords: news mail multimedia
@@ -50,10 +50,11 @@
 
 ;; The XEmacs version has a baroque, if not rococo, set of these.
 (defcustom smiley-regexp-alist
-  ;; Perhaps :-) should be distinct -- it does appear in the Jargon File.
-  '(("\\([:;]-?)\\)\\W" 1 "smile.pbm")
+  '(("\\(:-?)\\)\\W" 1 "smile.pbm")
+    ("\\(;-?)\\)\\W" 1 "blink.pbm")
     ("\\(:-[/\\]\\)\\W" 1 "wry.pbm")
-    ("\\(:-[({]\\)\\W" 1 "frown.pbm"))
+    ("\\(:-(\\)\\W" 1 "sad.pbm")
+    ("\\(:-{\\)\\W" 1 "frown.pbm"))
   "*A list of regexps to map smilies to images.
 The elements are (REGEXP MATCH FILE), where MATCH is the submatch in
 rgexp to replace with IMAGE.  IMAGE is the name of a PBM file in