ERC match ACTION patch

ERC match ACTION patch

[Aidan Gauland]

`erc-match-message' truncates the beginning of ACTION messages.  This
should fix it, but I'm not certain that I have not missed any obscure
edge cases.

–Aidan

Re: ERC match ACTION patch

[Aidan Gauland]

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

Aidan Gauland <aidalgol@no8wireless.co.nz> writes:
> `erc-match-message' truncates the beginning of ACTION messages.  This
> should fix it, but I'm not certain that I have not missed any obscure
> edge cases.
>
> –Aidan

Aaaaand here's the patch I forgot.

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

=== 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 18:36:54 +0000
@@ -454,7 +454,15 @@
 		     (match-end 0)))
 	 (message (buffer-substring (if (and nick-end
 					     (<= (+ 2 nick-end) (point-max)))
-					(+ 2 nick-end)
+					(+ 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))
 				      (point-min))
 				    (point-max))))
     (when (and vector

Re: ERC match ACTION patch

[Aidan Gauland]

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

Aidan Gauland <aidalgol@no8wireless.co.nz> writes:
> `erc-match-message' truncates the beginning of ACTION messages.  This
> should fix it, but I'm not certain that I have not missed any obscure
> edge cases.

Actually, that patch raised an error every time.  The conditional in
this one does not, and is simpler (and should still be correct,
obviously).

–Aidan

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

=== 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-12 03:13:26 +0000
@@ -454,7 +454,14 @@
 		     (match-end 0)))
 	 (message (buffer-substring (if (and nick-end
 					     (<= (+ 2 nick-end) (point-max)))
-					(+ 2 nick-end)
+					;; Message starts 2 characters after
+					;; the nick except for CTCP ACTION
+					;; messages.  Nick surrounded by angle
+					;; brackets only in normal messages.
+					(+ nick-end
+					   (if (eq ?> (char-after nick-end))
+					       2
+					     1))
 				      (point-min))
 				    (point-max))))
     (when (and vector