From: Philip Kaludercic <philipk@posteo.net>
Date: Tue, 14 Sep 2021 20:10:14 +0000 (+0200)
Subject: Fix interactive forms for rcirc-define-command
X-Git-Tag: emacs-28.0.90~948^2
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5ebad79e622e0e645bdcf0a149091698e9bc877f;p=emacs.git

Fix interactive forms for rcirc-define-command

* rcirc.el (rcirc-define-command): Handle string descriptors correctly
---

diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el
index b0374a545cd..bc67562d2d3 100644
--- a/lisp/net/rcirc.el
+++ b/lisp/net/rcirc.el
@@ -2569,13 +2569,13 @@ that, an interactive form can specified."
     (when (stringp (car body))
       (setq documentation (pop body)))
     (when (eq (car-safe (car-safe body)) 'interactive)
-      (setq interactive-spec (cdr (pop body))))
+      (setq interactive-spec (cadr (pop body))))
     `(progn
        (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))
+         (interactive ,interactive-spec)
          (unless (if (listp ,argument)
                      (<= ,required (length ,argument) ,total)
                    (string-match ,regexp ,argument))