[PATCH] gnus: Make gnus smiley regexps match at end of region

[PATCH] gnus: Make gnus smiley regexps match at end of region

[Adrian Aichner]

I'd like to suggest following patch, which is required to make EOL
smilies work in erc.
gnus ChangeLog patch:
Diff command:   cvs -q diff -U 0
Files affected: lisp/ChangeLog

Index: lisp/ChangeLog
===================================================================
RCS file: /usr/local/cvsroot/gnus/lisp/ChangeLog,v
retrieving revision 7.1263
diff -u -U0 -r7.1263 ChangeLog
--- lisp/ChangeLog	26 May 2006 17:50:12 -0000	7.1263
+++ lisp/ChangeLog	28 May 2006 22:56:02 -0000
@@ -0,0 +1,9 @@
+2006-05-29  Adrian Aichner  <adrian@xemacs.org>
+
+	* smiley.el (smiley-regexp-alist): Make gnus smiley regexps match at
+	end of region.
+

Best regards!

Adrian

gnus source patch:
Diff command:   cvs -f -z3 -q diff -u -w -N
Files affected: lisp/smiley.el

Index: lisp/smiley.el
===================================================================
RCS file: /usr/local/cvsroot/gnus/lisp/smiley.el,v
retrieving revision 7.15
diff -u -w -r7.15 smiley.el
--- lisp/smiley.el	15 Apr 2006 16:01:35 -0000	7.15
+++ lisp/smiley.el	28 May 2006 22:54:15 -0000
@@ -104,19 +104,19 @@
 
 ;; The XEmacs version has a baroque, if not rococo, set of these.
 (defcustom smiley-regexp-alist
-  '(("\\(;-?)\\)\\W" 1 "blink")
-    ("\\(:-]\\)\\W" 1 "forced")
-    ("\\(8-)\\)\\W" 1 "braindamaged")
-    ("\\(:-|\\)\\W" 1 "indifferent")
-    ("\\(:-[/\\]\\)\\W" 1 "wry")
-    ("\\(:-(\\)\\W" 1 "sad")
-    ("\\(:-{\\)\\W" 1 "frown")
-    ("\\(>:-)\\)\\W" 1 "evil")
-    ("\\(;-(\\)\\W" 1 "cry")
-    ("\\(X-)\\)\\W" 1 "dead")
-    ("\\(:-D\\)\\W" 1 "grin")
+  '(("\\(;-?)\\)\\B" 1 "blink")
+    ("\\(:-]\\)\\B" 1 "forced")
+    ("\\(8-)\\)\\B" 1 "braindamaged")
+    ("\\(:-|\\)\\B" 1 "indifferent")
+    ("\\(:-[/\\]\\)\\B" 1 "wry")
+    ("\\(:-(\\)\\B" 1 "sad")
+    ("\\(:-{\\)\\B" 1 "frown")
+    ("\\(>:-)\\)\\B" 1 "evil")
+    ("\\(;-(\\)\\B" 1 "cry")
+    ("\\(X-)\\)\\B" 1 "dead")
+    ("\\(:-D\\)\\B" 1 "grin")
     ;; "smile" must be come after "evil"
-    ("\\(\\^?:-?)\\)\\W" 1 "smile"))
+    ("\\(\\^?:-?)\\)\\B" 1 "smile"))
   "*A list of regexps to map smilies to images.
 The elements are (REGEXP MATCH IMAGE), where MATCH is the submatch in
 regexp to replace with IMAGE.  IMAGE is the name of an image file in

-- 
Adrian Aichner
 mailto:adrian@xemacs.org
 http://www.xemacs.org/

Re: [PATCH] gnus: Make gnus smiley regexps match at end of region

[Reiner Steib]

On Mon, May 29 2006, Adrian Aichner wrote:

> +2006-05-29  Adrian Aichner  <adrian@xemacs.org>
> +
> +	* smiley.el (smiley-regexp-alist): Make gnus smiley regexps match at
> +	end of region.

Adrian, we already have several (small?) changes from you in Gnus and
in Emacs.  I didn't count the lines of your patches, but I'm afraid
that your accumulated changes are more than the `tiny change' limit
(10-15 lines) and we cannot install further changes by you.

[ Probably you know the following, but just in case, I repeat it here: ]
Gnus is a part of Emacs and since Emacs is a core GNU project, the
Free Software Foundation (FSF) requires an assignment of copyright for
contributions, so that it is able to defend Emacs' legal status
without doubts, should the need arise.  You can either sign papers
only for Gnus or for Emacs (which covers Gnus, too).  If you agree, I
can send you the necessary form.

The same holds for the patches you submitted last year:
http://thread.gmane.org/gmane.emacs.gnus.general/61435/focus=61464

Bye, Reiner.
-- 
       ,,,
      (o o)
---ooO-(_)-Ooo---  |  PGP key available  |  http://rsteib.home.pages.de/

Re: [PATCH] gnus: Make gnus smiley regexps match at end of region

[Adrian Aichner]

Reiner Steib <reinersteib+gmane@imap.cc> writes:

> On Mon, May 29 2006, Adrian Aichner wrote:
>
>> +2006-05-29  Adrian Aichner  <adrian@xemacs.org>
>> +
>> +	* smiley.el (smiley-regexp-alist): Make gnus smiley regexps match at
>> +	end of region.
>
> Adrian, we already have several (small?) changes from you in Gnus and
> in Emacs.  I didn't count the lines of your patches, but I'm afraid
> that your accumulated changes are more than the `tiny change' limit
> (10-15 lines) and we cannot install further changes by you.
>
> [ Probably you know the following, but just in case, I repeat it here: ]
> Gnus is a part of Emacs and since Emacs is a core GNU project, the
> Free Software Foundation (FSF) requires an assignment of copyright for
> contributions, so that it is able to defend Emacs' legal status
> without doubts, should the need arise.  You can either sign papers
> only for Gnus or for Emacs (which covers Gnus, too).  If you agree, I
> can send you the necessary form.
>
> The same holds for the patches you submitted last year:
> http://thread.gmane.org/gmane.emacs.gnus.general/61435/focus=61464

Hello Reiner, my papers are now in.

Can me changes please be installed now?

Best regards!

Adrian

>
> Bye, Reiner.

-- 
Adrian Aichner
 mailto:adrian@xemacs.org
 http://www.xemacs.org/

Re: [PATCH] gnus: Make gnus smiley regexps match at end of region

[Reiner Steib]

On Tue, Feb 12 2008, Adrian Aichner wrote:

> Hello Reiner, my papers are now in.
>
> Can me changes please be installed now?

Unfortunately, in the copyright list, I can only see a new entry for
XEmacs, not for Emacs (or Gnus).  I wrote to the copyright clerk
asking for clarification (Cc-ing you).  Sorry for the inconvenience.

Bye, Reiner.
-- 
       ,,,
      (o o)
---ooO-(_)-Ooo---  |  PGP key available  |  http://rsteib.home.pages.de/

Re: [PATCH] gnus: Make gnus smiley regexps match at end of region

[Reiner Steib]

On Mon, May 29 2006, Adrian Aichner wrote:

> I'd like to suggest following patch, which is required to make EOL
> smilies work in erc.
[...]
> +2006-05-29  Adrian Aichner  <adrian@xemacs.org>
> +
> +	* smiley.el (smiley-regexp-alist): Make gnus smiley regexps match at
> +	end of region.

Could you post a test message to demonstrate the difference or isn't
it visible in Gnus?

The patch doesn't apply.  Did you only replace "\\W" with "\\B"
everywhere?

> diff -u -w -r7.15 smiley.el
> --- lisp/smiley.el	15 Apr 2006 16:01:35 -0000	7.15
> +++ lisp/smiley.el	28 May 2006 22:54:15 -0000
> @@ -104,19 +104,19 @@
>
>  ;; The XEmacs version has a baroque, if not rococo, set of these.
>  (defcustom smiley-regexp-alist
> -  '(("\\(;-?)\\)\\W" 1 "blink")
> -    ("\\(:-]\\)\\W" 1 "forced")
> -    ("\\(8-)\\)\\W" 1 "braindamaged")
> -    ("\\(:-|\\)\\W" 1 "indifferent")
> -    ("\\(:-[/\\]\\)\\W" 1 "wry")
> -    ("\\(:-(\\)\\W" 1 "sad")
> -    ("\\(:-{\\)\\W" 1 "frown")
> -    ("\\(>:-)\\)\\W" 1 "evil")
> -    ("\\(;-(\\)\\W" 1 "cry")
> -    ("\\(X-)\\)\\W" 1 "dead")
> -    ("\\(:-D\\)\\W" 1 "grin")
> +  '(("\\(;-?)\\)\\B" 1 "blink")
> +    ("\\(:-]\\)\\B" 1 "forced")
> +    ("\\(8-)\\)\\B" 1 "braindamaged")
> +    ("\\(:-|\\)\\B" 1 "indifferent")
> +    ("\\(:-[/\\]\\)\\B" 1 "wry")
> +    ("\\(:-(\\)\\B" 1 "sad")
> +    ("\\(:-{\\)\\B" 1 "frown")
> +    ("\\(>:-)\\)\\B" 1 "evil")
> +    ("\\(;-(\\)\\B" 1 "cry")
> +    ("\\(X-)\\)\\B" 1 "dead")
> +    ("\\(:-D\\)\\B" 1 "grin")
>      ;; "smile" must be come after "evil"
> -    ("\\(\\^?:-?)\\)\\W" 1 "smile"))
> +    ("\\(\\^?:-?)\\)\\B" 1 "smile"))
>    "*A list of regexps to map smilies to images.
>  The elements are (REGEXP MATCH IMAGE), where MATCH is the submatch in
>  regexp to replace with IMAGE.  IMAGE is the name of an image file in

Bye, Reiner.
-- 
       ,,,
      (o o)
---ooO-(_)-Ooo---  |  PGP key available  |  http://rsteib.home.pages.de/