diff options
| author | Tom Tromey <tromey@redhat.com> | 2013-03-08 11:57:29 -0700 |
|---|---|---|
| committer | Tom Tromey <tromey@redhat.com> | 2013-03-08 11:57:29 -0700 |
| commit | 71f91792e3013b397996905224f387da5cc539a9 (patch) | |
| tree | 4c3d3ba909e76deea1cdf73b73fca67a57149465 /lisp/erc | |
| parent | 6f4de085f065e11f4df3195d47479f28f5ef08ba (diff) | |
| parent | b5426561089d39f18b42bed9dbfcb531f43ed562 (diff) | |
| download | emacs-71f91792e3013b397996905224f387da5cc539a9.tar.gz | |
merge from trunk
Diffstat (limited to 'lisp/erc')
| -rw-r--r-- | lisp/erc/ChangeLog | 13 | ||||
| -rw-r--r-- | lisp/erc/erc-dcc.el | 1 | ||||
| -rw-r--r-- | lisp/erc/erc-match.el | 18 |
3 files changed, 26 insertions, 6 deletions
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog index bbe551c735d..f3d54782897 100644 --- a/lisp/erc/ChangeLog +++ b/lisp/erc/ChangeLog @@ -1,3 +1,16 @@ +2013-02-13 Aidan Gauland <aidalgol@no8wireless.co.nz> + + * erc-match.el (erc-match-message): Fix last commit. + +2013-02-12 Aidan Gauland <aidalgol@no8wireless.co.nz> + + * erc-match.el (erc-match-message): + Don't truncate action messages. (Bug#13689) + +2013-02-09 Eli Zaretskii <eliz@gnu.org> + + * erc-dcc.el (erc-dcc-get-file): Don't reference buffer-file-type. + 2013-01-11 Dmitry Antipov <dmantipov@yandex.ru> * erc-dcc.el (erc-dcc-send-file): Use point-min-marker. diff --git a/lisp/erc/erc-dcc.el b/lisp/erc/erc-dcc.el index c27bb629f9d..acb8febea80 100644 --- a/lisp/erc/erc-dcc.el +++ b/lisp/erc/erc-dcc.el @@ -942,7 +942,6 @@ filter and a process sentinel, and making the connection." (set-buffer-multibyte nil)) (setq mode-line-process '(":%s") - buffer-file-type t buffer-read-only t) (setq erc-dcc-file-name file) diff --git a/lisp/erc/erc-match.el b/lisp/erc/erc-match.el index 7ca86b5ac95..63683890226 100644 --- a/lisp/erc/erc-match.el +++ b/lisp/erc/erc-match.el @@ -452,11 +452,19 @@ Use this defun with `erc-insert-modify-hook'." (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))) + ;; 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 (not (and erc-match-exclude-server-buffer (erc-server-buffer-p)))) |