From: Julien Danjou Date: Mon, 14 May 2012 15:42:23 +0000 (+0200) Subject: Fix a regression in erc-dcc X-Git-Tag: emacs-24.2.90~471^2~87 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d372248073cecc1d8ae1d6bed826692eab16274d;p=emacs.git 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. --- 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 @@ +2012-05-14 Mike Kazantsev (tiny change) + + * 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. + 2012-05-13 Teemu Likonen * 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 ?r "SEND" ?n nick ?u login ?h host)) ((string-match erc-dcc-ctcp-query-send-regexp query) (let ((filename - (or (match-string 3 query) + (or (match-string 5 query) (erc-dcc-unquote-filename (match-string 2 query)))) (ip (erc-decimal-to-ip (match-string 6 query))) (port (match-string 7 query))