[Emacs-diffs] /srv/bzr/emacs/trunk r111739: Aidan Gauland <address@hidden>

[Stefan Monnier]

------------------------------------------------------------
revno: 111739
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Mon 2013-02-11 17:53:36 -0500
message:
  Aidan Gauland <address@hidden>
  Fixes: debbugs:13689
  
  * lisp/erc/erc-match.el (erc-match-message): Don't truncate action messages.
modified:
  lisp/ChangeLog
  lisp/erc/erc-match.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-02-11 19:29:40 +0000
+++ b/lisp/ChangeLog    2013-02-11 22:53:36 +0000
@@ -1,7 +1,7 @@
 2013-02-11  Elias Pipping  <address@hidden>
 
        * doc-view.el (doc-view-current-cache-dir): Beware % escapes
-       (bug#13679).
+       (bug#13689).
 
 2013-02-11  Stefan Monnier  <address@hidden>
 

=== modified file 'lisp/erc/erc-match.el'
--- a/lisp/erc/erc-match.el     2013-01-02 16:13:04 +0000
+++ b/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)
                        (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))))