diff options
| author | Julien Danjou | 2012-05-14 17:42:23 +0200 |
|---|---|---|
| committer | Julien Danjou | 2012-05-14 17:42:23 +0200 |
| commit | d372248073cecc1d8ae1d6bed826692eab16274d (patch) | |
| tree | d4b50932a52f5d1f1dd09b3c77036e19a5b3bd00 | |
| parent | 078c97cbfff4348646b4158fb9a160d88150daa9 (diff) | |
| download | emacs-d372248073cecc1d8ae1d6bed826692eab16274d.tar.gz emacs-d372248073cecc1d8ae1d6bed826692eab16274d.zip | |
Fix a regression in erc-dcc
* erc-dcc.el (erc-dcc-handle-ctcp-send): Fix a regression
introduced on 2011-11-28 when fixing quoted filenames matching,
the regex group was not corrected.
| -rw-r--r-- | lisp/erc/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/erc/erc-dcc.el | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog index 134938af78e..9585c249cb2 100644 --- a/lisp/erc/ChangeLog +++ b/lisp/erc/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2012-05-14 Mike Kazantsev <mk.fraggod@gmail.com> (tiny change) | ||
| 2 | |||
| 3 | * erc-dcc.el (erc-dcc-handle-ctcp-send): Fix a regression | ||
| 4 | introduced on 2011-11-28 when fixing quoted filenames matching, | ||
| 5 | the regex group was not corrected. | ||
| 6 | |||
| 1 | 2012-05-13 Teemu Likonen <tlikonen@iki.fi> | 7 | 2012-05-13 Teemu Likonen <tlikonen@iki.fi> |
| 2 | 8 | ||
| 3 | * erc-backend.el (erc-server-timestamp-format): New variable to | 9 | * erc-backend.el (erc-server-timestamp-format): New variable to |
diff --git a/lisp/erc/erc-dcc.el b/lisp/erc/erc-dcc.el index ba87cf63993..d1ef1a99548 100644 --- a/lisp/erc/erc-dcc.el +++ b/lisp/erc/erc-dcc.el | |||
| @@ -674,7 +674,7 @@ It extracts the information about the dcc request and adds it to | |||
| 674 | ?r "SEND" ?n nick ?u login ?h host)) | 674 | ?r "SEND" ?n nick ?u login ?h host)) |
| 675 | ((string-match erc-dcc-ctcp-query-send-regexp query) | 675 | ((string-match erc-dcc-ctcp-query-send-regexp query) |
| 676 | (let ((filename | 676 | (let ((filename |
| 677 | (or (match-string 3 query) | 677 | (or (match-string 5 query) |
| 678 | (erc-dcc-unquote-filename (match-string 2 query)))) | 678 | (erc-dcc-unquote-filename (match-string 2 query)))) |
| 679 | (ip (erc-decimal-to-ip (match-string 6 query))) | 679 | (ip (erc-decimal-to-ip (match-string 6 query))) |
| 680 | (port (match-string 7 query)) | 680 | (port (match-string 7 query)) |