mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-22 10:26:20 +00:00
Code Issues Releases Activity

Aidan Gauland <aidalgol@no8wireless.co.nz>

Browse Source 
Fixes: debbugs:13689

* lisp/erc/erc-match.el (erc-match-message): Don't truncate action messages.
This commit is contained in:
Stefan Monnier 2013-02-11 17:53:36 -05:00
parent b09a48104f
commit 6659b59ccb
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lisp/ChangeLog
View File

@ -1,7 +1,7 @@
2013-02-11 Elias Pipping <pipping@lavabit.com> 2013-02-11 Elias Pipping <pipping@lavabit.com>
* doc-view.el (doc-view-current-cache-dir): Beware % escapes * doc-view.el (doc-view-current-cache-dir): Beware % escapes
(bug#13679). (bug#13689).
2013-02-11 Stefan Monnier <monnier@iro.umontreal.ca> 2013-02-11 Stefan Monnier <monnier@iro.umontreal.ca>

20
lisp/erc/erc-match.el
View File

@ -447,16 +447,24 @@ Use this defun with `erc-insert-modify-hook'."
(nth 0 (erc-parse-user nickuserhost)))) (nth 0 (erc-parse-user nickuserhost))))
(old-pt (point)) (old-pt (point))
(nick-beg (and nickname (nick-beg (and nickname
(re-search-forward (regexp-quote nickname) (re-search-forward "\\(\\* \\)?"(regexp-quote nickname)
(point-max) t) (point-max) t)
(match-beginning 0))) (match-beginning 0)))
(nick-end (when nick-beg (nick-end (when nick-beg
(match-end 0))) (match-end 0)))
(message (buffer-substring (if (and nick-end (message (buffer-substring
(<= (+ 2 nick-end) (point-max))) (if (and nick-end
(+ 2 nick-end) (<= (+ 2 nick-end) (point-max)))
(point-min)) (+ nick-end
(point-max)))) ;; 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 (when (and vector
(not (and erc-match-exclude-server-buffer (not (and erc-match-exclude-server-buffer
(erc-server-buffer-p)))) (erc-server-buffer-p))))