smiley-regexp-alist: Don't delete the semicolon before the blinking smiley by Miles...

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 3b6e59a32f297d74751e9df25b418005426e2aff..d55f89c28b68a4eef6a5926be2d0a5461589820a 100644 (file)
--- 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 fbe71e7725fa50c9732cc4c106cd6f7fd94196ff..ef0a6c7790bf44529ebf0673031fc3b2f544f4f5 100644 (file)
--- 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")