[Emacs-diffs] /srv/bzr/emacs/trunk r101215: smiley-regexp-alist: Don't delete the semicolon before the blinking smiley by Miles Bader <address@hidden>; Disallow ; ; ) from being treated as a blink smiley by Simon Josefsson <address@hidden>.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 101215
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Mon 2010-08-30 06:28:53 +0000
message:
  smiley-regexp-alist: Don't delete the semicolon before the blinking smiley by 
Miles Bader <address@hidden>; Disallow ;;) from being treated as a blink smiley 
by Simon Josefsson <address@hidden>.
  
  2009-03-24  Miles Bader  <address@hidden>
   * smiley.el (smiley-regexp-alist): Don't delete the semicolon before
   the blinking smiley.
  2009-03-24  Simon Josefsson  <address@hidden>
   * smiley.el (smiley-regexp-alist): Disallow ;;) from being treated as a
   blink smiley.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/smiley.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2010-08-30 06:25:05 +0000
+++ b/lisp/gnus/ChangeLog       2010-08-30 06:28:53 +0000
@@ -1,3 +1,13 @@
+2009-03-24  Miles Bader  <address@hidden>
+
+       * smiley.el (smiley-regexp-alist): Don't delete the semicolon before
+       the blinking smiley.
+
+2009-03-24  Simon Josefsson  <address@hidden>
+
+       * smiley.el (smiley-regexp-alist): Disallow ;;) from being treated as a
+       blink smiley.
+
 2010-08-29  Lars Magne Ingebrigtsen  <address@hidden>
 
        * gnus-start.el (gnus-dribble-read-file): Ensure that the directory

=== modified file 'lisp/gnus/smiley.el'
--- a/lisp/gnus/smiley.el       2010-03-22 15:49:52 +0000
+++ b/lisp/gnus/smiley.el       2010-08-30 06:28:53 +0000
@@ -102,7 +102,8 @@
 
 ;; 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")