summaryrefslogtreecommitdiff
path: root/lisp/erc/erc-dcc.el
diff options
context:
space:
mode:
authorF. Jason Park <jp@neverwas.me>2022-04-09 23:32:22 -0700
committerF. Jason Park <jp@neverwas.me>2022-05-22 18:04:52 -0700
commit758775f15849a5c6f700ab7111449c3ec678bd8a (patch)
tree5f105919921b106164036719b1b023878b15c640 /lisp/erc/erc-dcc.el
parent37e26fc5379715010297adff5109736b7ede5cd7 (diff)
downloademacs-758775f15849a5c6f700ab7111449c3ec678bd8a.tar.gz
Allow matching against string values in erc-dcc-member
* lisp/erc/erc-dcc.el (erc-dcc-member): Be more tolerant in the catch-all case by testing for equality instead of identity. (erc-dcc-do-GET-command): Pass file name when querying `erc-dcc-member'. (Bug#54458)
Diffstat (limited to 'lisp/erc/erc-dcc.el')
-rw-r--r--lisp/erc/erc-dcc.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/erc/erc-dcc.el b/lisp/erc/erc-dcc.el
index 2a06efdaa4e..babd0f30461 100644
--- a/lisp/erc/erc-dcc.el
+++ b/lisp/erc/erc-dcc.el
@@ -196,7 +196,7 @@ compared with `erc-nick-equal-p' which is IRC case-insensitive."
(erc-extract-nick test)
(erc-extract-nick val)))
;; not a nick
- (eq test val)
+ (equal test val)
(setq cont nil))))
(if cont
(setq result elt)
@@ -507,7 +507,7 @@ FILE is the filename. If FILE is split into multiple arguments,
re-join the arguments, separated by a space.
PROC is the server process."
(setq file (and file (mapconcat #'identity file " ")))
- (let* ((elt (erc-dcc-member :nick nick :type 'GET))
+ (let* ((elt (erc-dcc-member :nick nick :type 'GET :file file))
(filename (or file (plist-get elt :file) "unknown")))
(if elt
(let* ((file (read-file-name