This patch is not directly applicable upstream, but I'll suggest a
similar one there.
Any objections?
Best regards!
Adrian
packages ChangeLog patch:
Diff command: cvs -q diff -U 0
Files affected: xemacs-packages/gnus/ChangeLog
Index: xemacs-packages/gnus/ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/ChangeLog,v
retrieving revision 1.101
diff -u -U0 -r1.101 ChangeLog
--- xemacs-packages/gnus/ChangeLog 16 Mar 2006 06:09:49 -0000 1.101
+++ xemacs-packages/gnus/ChangeLog 28 May 2006 22:51:51 -0000
@@ -0,0 +1,6 @@
+2006-05-29 Adrian Aichner <adrian(a)xemacs.org>
+
+ * lisp/smiley.el (smiley-deformed-regexp-alist): Make gnus smiley
+ regexps match at end of region.
+ * lisp/smiley.el (smiley-nosey-regexp-alist): Ditto.
+
packages source patch:
Diff command: cvs -f -z3 -q diff -u -w -N
Files affected: xemacs-packages/gnus/lisp/smiley.el
Index: xemacs-packages/gnus/lisp/smiley.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/smiley.el,v
retrieving revision 1.2
diff -u -w -r1.2 smiley.el
--- xemacs-packages/gnus/lisp/smiley.el 2 May 2003 00:27:21 -0000 1.2
+++ xemacs-packages/gnus/lisp/smiley.el 28 May 2006 22:51:08 -0000
@@ -61,29 +61,29 @@
;; two alists below.
(defcustom smiley-deformed-regexp-alist
- '(("\\(\\^_?\\^;;;\\)\\W" 1 "WideFaceAse3.xbm")
- ("\\(\\^_?\\^;;\\)\\W" 1 "WideFaceAse2.xbm")
- ("\\(\\^_?\\^;\\)\\W" 1 "WideFaceAse1.xbm")
- ("\\(\\^_?\\^\\)\\W" 1 "WideFaceSmile.xbm")
- ("\\(;_;\\)\\W" 1 "WideFaceWeep.xbm")
- ("\\(T_T\\)\\W" 1 "WideFaceWeep.xbm")
- ("\\(:-*[<«]+\\)\\W" 1 "FaceAngry.xpm")
- ("\\(:-+\\]+\\)\\W" 1 "FaceGoofy.xpm")
- ("\\(:-*D\\)\\W" 1 "FaceGrinning.xpm")
- ("\\(:-*[)>}»]+\\)\\W" 1 "FaceHappy.xpm")
- ("\\(=[)»]+\\)\\W" 1 "FaceHappy.xpm")
- ("\\(:-*[/\\\"]\\)[^/]\\W" 1 "FaceIronic.xpm")
- ("[^.0-9]\\([8|]-*[|Oo%]\\)\\W" 1 "FaceKOed.xpm")
- ("\\([:|]-*#+\\)\\W" 1 "FaceNyah.xpm")
- ("\\(:-*[({]+\\)\\W" 1 "FaceSad.xpm")
- ("\\(=[({]+\\)\\W" 1 "FaceSad.xpm")
- ("\\(:-*[Oo\*]\\)\\W" 1 "FaceStartled.xpm")
- ("\\(:-*|\\)\\W" 1 "FaceStraight.xpm")
- ("\\(:-*p\\)\\W" 1 "FaceTalking.xpm")
- ("\\(:-*d\\)\\W" 1 "FaceTasty.xpm")
- ("\\(;-*[>)}»]+\\)\\W" 1 "FaceWinking.xpm")
- ("\\(:-*[Vvµ]\\)\\W" 1 "FaceWry.xpm")
- ("\\([:|]-*P\\)\\W" 1 "FaceYukky.xpm"))
+ '(("\\(\\^_?\\^;;;\\)\\B" 1 "WideFaceAse3.xbm")
+ ("\\(\\^_?\\^;;\\)\\B" 1 "WideFaceAse2.xbm")
+ ("\\(\\^_?\\^;\\)\\B" 1 "WideFaceAse1.xbm")
+ ("\\(\\^_?\\^\\)\\B" 1 "WideFaceSmile.xbm")
+ ("\\(;_;\\)\\B" 1 "WideFaceWeep.xbm")
+ ("\\(T_T\\)\\B" 1 "WideFaceWeep.xbm")
+ ("\\(:-*[<«]+\\)\\B" 1 "FaceAngry.xpm")
+ ("\\(:-+\\]+\\)\\B" 1 "FaceGoofy.xpm")
+ ("\\(:-*D\\)\\B" 1 "FaceGrinning.xpm")
+ ("\\(:-*[)>}»]+\\)\\B" 1 "FaceHappy.xpm")
+ ("\\(=[)»]+\\)\\B" 1 "FaceHappy.xpm")
+ ("\\(:-*[/\\\"]\\)[^/]\\B" 1 "FaceIronic.xpm")
+ ("[^.0-9]\\([8|]-*[|Oo%]\\)\\B" 1 "FaceKOed.xpm")
+ ("\\([:|]-*#+\\)\\B" 1 "FaceNyah.xpm")
+ ("\\(:-*[({]+\\)\\B" 1 "FaceSad.xpm")
+ ("\\(=[({]+\\)\\B" 1 "FaceSad.xpm")
+ ("\\(:-*[Oo\*]\\)\\B" 1 "FaceStartled.xpm")
+ ("\\(:-*|\\)\\B" 1 "FaceStraight.xpm")
+ ("\\(:-*p\\)\\B" 1 "FaceTalking.xpm")
+ ("\\(:-*d\\)\\B" 1 "FaceTasty.xpm")
+ ("\\(;-*[>)}»]+\\)\\B" 1 "FaceWinking.xpm")
+ ("\\(:-*[Vvµ]\\)\\B" 1 "FaceWry.xpm")
+ ("\\([:|]-*P\\)\\B" 1 "FaceYukky.xpm"))
"*Normal and deformed faces for smilies."
:type '(repeat (list regexp
(integer :tag "Match")
@@ -91,25 +91,25 @@
:group 'smiley)
(defcustom smiley-nosey-regexp-alist
- '(("\\(:-+[<«]+\\)\\W" 1 "FaceAngry.xpm")
- ("\\(:-+\\]+\\)\\W" 1 "FaceGoofy.xpm")
- ("\\(:-+D\\)\\W" 1 "FaceGrinning.xpm")
- ("\\(:-+[}»]+\\)\\W" 1 "FaceHappy.xpm")
- ("\\(:-*)+\\)\\W" 1 "FaceHappy.xpm")
- ("\\(=[)]+\\)\\W" 1 "FaceHappy.xpm")
- ("\\(:-+[/\\\"]+\\)\\W" 1 "FaceIronic.xpm")
- ("\\([8|]-+[|Oo%]\\)\\W" 1 "FaceKOed.xpm")
- ("\\([:|]-+#+\\)\\W" 1 "FaceNyah.xpm")
- ("\\(:-+[({]+\\)\\W" 1 "FaceSad.xpm")
- ("\\(=[({]+\\)\\W" 1 "FaceSad.xpm")
- ("\\(:-+[Oo\*]\\)\\W" 1 "FaceStartled.xpm")
- ("\\(:-+|\\)\\W" 1 "FaceStraight.xpm")
- ("\\(:-+p\\)\\W" 1 "FaceTalking.xpm")
- ("\\(:-+d\\)\\W" 1 "FaceTasty.xpm")
- ("\\(;-+[>)}»]+\\)\\W" 1 "FaceWinking.xpm")
- ("\\(:-+[Vvµ]\\)\\W" 1 "FaceWry.xpm")
- ("\\(][:8B]-[)>]\\)\\W" 1 "FaceDevilish.xpm")
- ("\\([:|]-+P\\)\\W" 1 "FaceYukky.xpm"))
+ '(("\\(:-+[<«]+\\)\\B" 1 "FaceAngry.xpm")
+ ("\\(:-+\\]+\\)\\B" 1 "FaceGoofy.xpm")
+ ("\\(:-+D\\)\\B" 1 "FaceGrinning.xpm")
+ ("\\(:-+[}»]+\\)\\B" 1 "FaceHappy.xpm")
+ ("\\(:-*)+\\)\\B" 1 "FaceHappy.xpm")
+ ("\\(=[)]+\\)\\B" 1 "FaceHappy.xpm")
+ ("\\(:-+[/\\\"]+\\)\\B" 1 "FaceIronic.xpm")
+ ("\\([8|]-+[|Oo%]\\)\\B" 1 "FaceKOed.xpm")
+ ("\\([:|]-+#+\\)\\B" 1 "FaceNyah.xpm")
+ ("\\(:-+[({]+\\)\\B" 1 "FaceSad.xpm")
+ ("\\(=[({]+\\)\\B" 1 "FaceSad.xpm")
+ ("\\(:-+[Oo\*]\\)\\B" 1 "FaceStartled.xpm")
+ ("\\(:-+|\\)\\B" 1 "FaceStraight.xpm")
+ ("\\(:-+p\\)\\B" 1 "FaceTalking.xpm")
+ ("\\(:-+d\\)\\B" 1 "FaceTasty.xpm")
+ ("\\(;-+[>)}»]+\\)\\B" 1 "FaceWinking.xpm")
+ ("\\(:-+[Vvµ]\\)\\B" 1 "FaceWry.xpm")
+ ("\\(][:8B]-[)>]\\)\\B" 1 "FaceDevilish.xpm")
+ ("\\([:|]-+P\\)\\B" 1 "FaceYukky.xpm"))
"*Smileys with noses. These get less false matches."
:type '(repeat (list regexp
(integer :tag "Match")
--
Adrian Aichner
mailto:adrian@xemacs.org
http://www.xemacs.org/