Aidan Gauland <aidalgol@no8wireless.co.nz>

Fixes: debbugs:13689

* lisp/erc/erc-match.el (erc-match-message): Don't truncate action messages.

2 files changed, 15 insertions, 7 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7995703e4a5..fd2186fcfb2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,7 +1,7 @@
 2013-02-11  Elias Pipping  <pipping@lavabit.com>
 
         * doc-view.el (doc-view-current-cache-dir): Beware % escapes
-        (bug#13679).
+        (bug#13689).
 
 2013-02-11  Stefan Monnier  <monnier@iro.umontreal.ca>
 
diff --git a/lisp/erc/erc-match.el b/lisp/erc/erc-match.el
index 7ca86b5ac95..1da838557f7 100644
--- a/lisp/erc/erc-match.el
+++ b/lisp/erc/erc-match.el
@@ -447,16 +447,24 @@ Use this defun with `erc-insert-modify-hook'."
                         (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)
                         (match-beginning 0)))
          (nick-end (when nick-beg
                      (match-end 0)))
-         (message (buffer-substring (if (and nick-end
-                                             (<= (+ 2 nick-end) (point-max)))
-                                        (+ 2 nick-end)
-                                      (point-min))
-                                    (point-max))))
+         (message (buffer-substring
+                   (if (and nick-end
+                            (<= (+ 2 nick-end) (point-max)))
+                       (+ 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
                (not (and erc-match-exclude-server-buffer
                          (erc-server-buffer-p))))