From: Katsumi Yamaoka <yamaoka@jpl.org>
Date: Mon, 30 Aug 2010 06:28:53 +0000 (+0000)
Subject: smiley-regexp-alist: Don't delete the semicolon before the blinking smiley by Miles... 
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~48^2~212
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=07466c8e7b83841ddcd615cb991608052f698cbf;p=emacs.git

smiley-regexp-alist: Don't delete the semicolon before the blinking smiley by Miles Bader <miles@gnu.org>; Disallow ;;) from being treated as a blink smiley by Simon Josefsson <simon@josefsson.org>.

2009-03-24  Miles Bader  <miles@gnu.org>
 * smiley.el (smiley-regexp-alist): Don't delete the semicolon before
 the blinking smiley.
2009-03-24  Simon Josefsson  <simon@josefsson.org>
 * smiley.el (smiley-regexp-alist): Disallow ;;) from being treated as a
 blink smiley.
---

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 3b6e59a32f2..d55f89c28b6 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,13 @@
+2009-03-24  Miles Bader  <miles@gnu.org>
+
+	* smiley.el (smiley-regexp-alist): Don't delete the semicolon before
+	the blinking smiley.
+
+2009-03-24  Simon Josefsson  <simon@josefsson.org>
+
+	* smiley.el (smiley-regexp-alist): Disallow ;;) from being treated as a
+	blink smiley.
+
 2010-08-29  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
 	* gnus-start.el (gnus-dribble-read-file): Ensure that the directory
diff --git a/lisp/gnus/smiley.el b/lisp/gnus/smiley.el
index fbe71e7725f..ef0a6c7790b 100644
--- a/lisp/gnus/smiley.el
+++ b/lisp/gnus/smiley.el
@@ -102,7 +102,8 @@ is nil, use `smiley-style'."
 
 ;; 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")