emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

master 758775f158 3/5: Allow matching against string values in erc-dcc-m


From: F. Jason Park
Subject: master 758775f158 3/5: Allow matching against string values in erc-dcc-member
Date: Sun, 22 May 2022 21:08:00 -0400 (EDT)

branch: master
commit 758775f15849a5c6f700ab7111449c3ec678bd8a
Author: F. Jason Park <jp@neverwas.me>
Commit: F. Jason Park <jp@neverwas.me>

    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)
---
 lisp/erc/erc-dcc.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lisp/erc/erc-dcc.el b/lisp/erc/erc-dcc.el
index 2a06efdaa4..babd0f3046 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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]