diff options
| author | Stefan Monnier <[email protected]> | 2013-02-11 17:53:36 -0500 |
|---|---|---|
| committer | Stefan Monnier <[email protected]> | 2013-02-11 17:53:36 -0500 |
| commit | 6659b59ccb7909a07f71a0143fd9d85e60b8e414 (patch) | |
| tree | bd978ed3b74bc54990bef5053dfeb72ccdeffed1 | |
| parent | b09a48104f3459c0a849cf29716fce3493b26462 (diff) | |
Aidan Gauland <[email protected]>
Fixes: debbugs:13689
* lisp/erc/erc-match.el (erc-match-message): Don't truncate action messages.
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/erc/erc-match.el | 20 |
2 files changed, 15 insertions, 7 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 7995703e4a..fd2186fcfb 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,7 +1,7 @@ 2013-02-11 Elias Pipping <[email protected]> * doc-view.el (doc-view-current-cache-dir): Beware % escapes - (bug#13679). + (bug#13689). 2013-02-11 Stefan Monnier <[email protected]> diff --git a/lisp/erc/erc-match.el b/lisp/erc/erc-match.el index 7ca86b5ac9..1da838557f 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)))) |