Someone broke erc-match

Someone broke erc-match

[Aidan Gauland]

[-- Attachment #1: Type: text/plain, Size: 878 bytes --]

To Stefan Monnier:

When applying my erc-match patch, you broke another part:

=== modified file 'lisp/erc/erc-match.el'
--- lisp/erc/erc-match.el       2013-01-02 16:13:04 +0000
+++ lisp/erc/erc-match.el       2013-02-11 22:53:36 +0000
@@ -447,16 +447,24 @@
                        (nth 0 (erc-parse-user nickuserhost))))
         (old-pt (point))
         (nick-beg (and nickname
-                       (re-search-forward (regexp-quote nickname)
+                       (re-search-forward "\\(\\* \\)?"(regexp-quote nickname)
                                           (point-max) t)

It's not clear what was intended, so I cannot suggest a fix (aside from
simply reverting).

I also submitted a patch that supersedes my patch, which actually caused
an out-of-range error for every non-ACTION message.  Obviously worse
than truncating ACTION messages.  Here's my patch fix:


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: erc-match ACTION repatch --]
[-- Type: text/x-diff, Size: 810 bytes --]

=== modified file 'lisp/erc/erc-match.el'
--- lisp/erc/erc-match.el	2013-02-11 22:53:36 +0000
+++ lisp/erc/erc-match.el	2013-02-13 01:54:07 +0000
@@ -455,14 +455,14 @@
 	 (message (buffer-substring
 		   (if (and nick-end
 			    (<= (+ 2 nick-end) (point-max)))
+		       ;; Message starts 2 characters after the nick
+		       ;; except for CTCP ACTION messages.  Nick
+		       ;; surrounded by angle brackets only in normal
+		       ;; messages.
 		       (+ nick-end
-			  ;; Message starts 2 characters after the nick except
-			  ;; for CTCP ACTION messages.
-			  (if (string= "* "
-				       (buffer-substring (- nick-beg 2)
-							 nick-beg))
-			      1
-			    2))
+			  (if (eq ?> (char-after nick-end))
+			      2
+			    1))
 		     (point-min))
 		   (point-max))))
     (when (and vector


[-- Attachment #3: Type: text/plain, Size: 24 bytes --]


Regards,
Aidan Gauland

Re: Someone broke erc-match

[Stefan Monnier]

> -                       (re-search-forward (regexp-quote nickname)
> +                       (re-search-forward "\\(\\* \\)?"(regexp-quote nickname)
[...]
> It's not clear what was intended, so I cannot suggest a fix (aside from
> simply reverting).

Sorry, I wish I could say my cat did it.  I obviously wasn't really
awake when I installed your patch (I also messed up the ChangeLog part).

> I also submitted a patch that supersedes my patch, which actually caused
> an out-of-range error for every non-ACTION message.  Obviously worse
> than truncating ACTION messages.  Here's my patch fix:

Thanks, installed, hopefully I did it right this time!


        Stefan