changeset 34493:3e2309d79ff3

(smiley-regexp-alist): Make regexps match at the end of the buffer. (smiley-region): In the loop, move to the end of the submatch matching the smiley instead of using the end of the match of the whole regexp.
author Gerd Moellmann <gerd@gnu.org>
date Tue, 12 Dec 2000 16:54:45 +0000
parents c0363a97e5cb
children c9772e95b9c1
files lisp/gnus/smiley-ems.el
diffstat 1 files changed, 5 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/gnus/smiley-ems.el	Tue Dec 12 16:14:39 2000 +0000
+++ b/lisp/gnus/smiley-ems.el	Tue Dec 12 16:54:45 2000 +0000
@@ -52,9 +52,9 @@
 ;; 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 "wry.pbm")
-    ("\\(:-[({]\\)\\W" 1 "frown.pbm"))
+  '(("\\([:;]-?)\\)\\(\\W\\|\\'\\)" 1 "smile.pbm")
+    ("\\(:-[/\\]\\)\\(\\W\\|\\'\\)" 1 "wry.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
@@ -123,7 +123,8 @@
 	      (overlay-put overlay 'smiley t)
 	      (overlay-put overlay
 			   'help-echo "mouse-2: toggle smilies in buffer")
-	      (overlay-put overlay 'keymap smiley-mouse-map))))))
+	      (overlay-put overlay 'keymap smiley-mouse-map)
+	      (goto-char (match-end group)))))))
         (setq smiley-active t)))
 
 (defun smiley-toggle-buffer (&optional arg)