procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix handling of intspecs as string by rcirc-define-command

Browse source 
* rcirc.el (rcirc-define-command): Check if an interactive
  specification is a string, in which case it was to be wrapped in a
  list so that the result of its interpretation is passed as the first
  argument of the command resulting from the macro expansion.
This commit is contained in:
Philip Kaludercic 2022-04-19 13:16:51 +02:00
parent 5fe75feafc
commit 5df658a96a
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
lisp/net/rcirc.el
View file

@ -2616,15 +2616,22 @@ that, an interactive form can specified."
(defun ,fn-name (,argument &optional process target)
,(concat documentation
"\n\nNote: If PROCESS or TARGET are nil, the values given"
"\nby `rcirc-buffer-process' and `rcirc-target' will be used.")
(interactive (list ,interactive-spec))
"\nby `rcirc-buffer-process' and `rcirc-target' will be used.")
(interactive ,(if (stringp interactive-spec)
;; HACK: Necessary to wrap the result of
;; the interactive spec in a list.
`(list (call-interactively
(lambda (&rest args)
(interactive ,interactive-spec)
args)))
`(list ,interactive-spec)))
(unless (if (listp ,argument)
(<= ,required (length ,argument) ,total)
(string-match ,regexp ,argument))
(user-error "Malformed input (%s): %S" ',command ,argument))
(push ,(upcase (symbol-name command)) rcirc-pending-requests)
(let ((process (or process (rcirc-buffer-process)))
(target (or target rcirc-target)))
(target (or target rcirc-target)))
(ignore target process)
(let (,@(cl-loop
for i from 0 for arg in (delq '&optional arguments)