emacs-diffs
[Top][All Lists]
Advanced

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

master 9b66a64d9c2: Fix interactive forms in some Lisp packages


From: Eli Zaretskii
Subject: master 9b66a64d9c2: Fix interactive forms in some Lisp packages
Date: Sat, 6 May 2023 04:30:06 -0400 (EDT)

branch: master
commit 9b66a64d9c2c7ae2b155bf209ad735383070822e
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>

    Fix interactive forms in some Lisp packages
    
    * lisp/woman.el (woman-reset-emulation):
    * lisp/treesit.el (treesit--explorer-jump):
    * lisp/speedbar.el (speedbar-toggle-etags):
    * lisp/filesets.el (filesets-convert-patterns):
    * lisp/calculator.el (calculator-saved-move):
    * lisp/progmodes/gud.el (gud-basic-call):
    * lisp/progmodes/ebrowse.el (ebrowse-redraw-marks)
    (ebrowse-view-file-other-frame):
    * lisp/progmodes/dcl-mode.el (dcl-indent-to):
    * lisp/net/socks.el (socks-open-connection):
    * lisp/net/ntlm.el (ntlm-build-auth-request):
    * lisp/emacs-lisp/backtrace.el (backtrace-expand-ellipsis):
    * lisp/calc/calc-prog.el (calc-edit-macro-finish-edit):
    * lisp/calc/calc-misc.el (calc-info-goto-node):
    * lisp/net/dictionary.el (dictionary-new-search)
    (dictionary-definition, dictionary-switch-tooltip-mode): Fix
    interactive functions where the 'interactive' form did not supply
    the mandatory arguments.  (Bug#62864)
---
 lisp/calc/calc-misc.el       | 1 -
 lisp/calc/calc-prog.el       | 1 -
 lisp/calculator.el           | 5 +++--
 lisp/emacs-lisp/backtrace.el | 1 -
 lisp/filesets.el             | 1 -
 lisp/net/dictionary.el       | 3 ---
 lisp/net/ntlm.el             | 1 -
 lisp/net/socks.el            | 1 -
 lisp/progmodes/dcl-mode.el   | 2 +-
 lisp/progmodes/ebrowse.el    | 6 +++---
 lisp/progmodes/gud.el        | 2 +-
 lisp/speedbar.el             | 4 +---
 lisp/treesit.el              | 1 -
 lisp/woman.el                | 1 -
 14 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/lisp/calc/calc-misc.el b/lisp/calc/calc-misc.el
index 93de04a586d..4b1aab837af 100644
--- a/lisp/calc/calc-misc.el
+++ b/lisp/calc/calc-misc.el
@@ -195,7 +195,6 @@ Calc user interface as before (either \\`C-x * C' or \\`C-x 
* K'; initially \\`C
 ;;;###autoload
 (defun calc-info-goto-node (node)
   "Go to a node in the Calculator info documentation."
-  (interactive)
   (select-window (get-largest-window))
   (info (concat "(Calc)" node)))
 
diff --git a/lisp/calc/calc-prog.el b/lisp/calc/calc-prog.el
index d8569d0c5af..8502b5196d2 100644
--- a/lisp/calc/calc-prog.el
+++ b/lisp/calc/calc-prog.el
@@ -936,7 +936,6 @@
 (defun calc-edit-macro-finish-edit (cmdname key)
   "Finish editing a Calc macro.
 Redefine the corresponding command."
-  (interactive)
   (let ((cmd (intern cmdname)))
     (calc-edit-macro-pre-finish-edit)
     (let* ((str (buffer-substring calc-edit-top (point-max)))
diff --git a/lisp/calculator.el b/lisp/calculator.el
index 6a1d960c3e4..bf2ac9b6215 100644
--- a/lisp/calculator.el
+++ b/lisp/calculator.el
@@ -1349,8 +1349,9 @@ Optional string argument KEYS will force using it as the 
keys entered."
   (calculator-update-display t))
 
 (defun calculator-saved-move (n)
-  "Go N elements up the list of saved values."
-  (interactive)
+  "Go N elements up the list of saved values.
+Interactively, N is the prefix numeric argument and defaults to 1."
+  (interactive "p")
   (when (and calculator-saved-list
              (or (null calculator-stack) calculator-display-fragile))
     (setq calculator-saved-ptr
diff --git a/lisp/emacs-lisp/backtrace.el b/lisp/emacs-lisp/backtrace.el
index 53e17693933..57912c854b0 100644
--- a/lisp/emacs-lisp/backtrace.el
+++ b/lisp/emacs-lisp/backtrace.el
@@ -499,7 +499,6 @@ Reprint the frame with the new view plist."
 
 (defun backtrace-expand-ellipsis (button)
   "Expand display of the elided form at BUTTON."
-  (interactive)
   (goto-char (button-start button))
   (unless (get-text-property (point) 'cl-print-ellipsis)
     (if (and (> (point) (point-min))
diff --git a/lisp/filesets.el b/lisp/filesets.el
index 1b7e6ffa81f..81a194a45e6 100644
--- a/lisp/filesets.el
+++ b/lisp/filesets.el
@@ -1807,7 +1807,6 @@ If no fileset name is provided, prompt for NAME."
 
 (defun filesets-convert-patterns (name)
   "Change fileset NAME's mode from :pattern to :files."
-  (interactive)
   (let ((entry (assoc name filesets-data)))
     (if entry
        (let ((pattern  (filesets-entry-get-pattern entry))
diff --git a/lisp/net/dictionary.el b/lisp/net/dictionary.el
index d9973b831ba..ba65225692a 100644
--- a/lisp/net/dictionary.el
+++ b/lisp/net/dictionary.el
@@ -683,7 +683,6 @@ previous state."
   "Save the current state and start a new search based on ARGS.
 The parameter ARGS is a cons cell where car is the word to search
 and cdr is the dictionary where to search the word in."
-  (interactive)
   (dictionary-store-positions)
   (let ((word (car args))
        (dictionary (cdr args)))
@@ -1258,7 +1257,6 @@ allows editing it."
   :version "28.1")
 
 (defun dictionary-definition (word &optional dictionary)
-  (interactive)
   (unwind-protect
       (let ((dictionary (or dictionary dictionary-default-dictionary)))
        (dictionary-do-search word dictionary 'dictionary-read-definition t))
@@ -1315,7 +1313,6 @@ tooltip mode.  The hook function will check the value of 
the
 variable `dictionary-tooltip-mode' to decide if some action must be
 taken.  When disabling the tooltip mode the value of this variable
 will be set to nil."
-  (interactive)
   (tooltip-mode on)
   (if on
       (add-hook 'tooltip-functions #'dictionary-display-tooltip)
diff --git a/lisp/net/ntlm.el b/lisp/net/ntlm.el
index 356bf95669f..c92c90bf694 100644
--- a/lisp/net/ntlm.el
+++ b/lisp/net/ntlm.el
@@ -98,7 +98,6 @@ USER is a string representing a user name to be authenticated 
and
 DOMAIN is a NT domain.  USER can include a NT domain part as in
 user@domain where the string after @ is used as the domain if DOMAIN
 is not given."
-  (interactive)
   (let ((request-ident (concat "NTLMSSP" (make-string 1 0)))
        (request-msgType (concat (make-string 1 1) (make-string 3 0)))
                                        ;0x01 0x00 0x00 0x00
diff --git a/lisp/net/socks.el b/lisp/net/socks.el
index adf8b357dc3..968a28d2be8 100644
--- a/lisp/net/socks.el
+++ b/lisp/net/socks.el
@@ -328,7 +328,6 @@
   (advice-add 'open-network-stream :around #'socks--open-network-stream))
 
 (defun socks-open-connection (server-info)
-  (interactive)
   (save-excursion
     (let ((proc
            (let ((socks-override-functions nil))
diff --git a/lisp/progmodes/dcl-mode.el b/lisp/progmodes/dcl-mode.el
index 0bb1a01f902..cf589762e8f 100644
--- a/lisp/progmodes/dcl-mode.el
+++ b/lisp/progmodes/dcl-mode.el
@@ -1396,7 +1396,7 @@ regexps in `dcl-electric-reindent-regexps'."
 ;;;-------------------------------------------------------------------------
 (defun dcl-indent-to (col &optional minimum)
   "Like `indent-to', but only indents if indentation would change."
-  (interactive)
+  (interactive "NIndent to column: ")
   (let (cur-indent collapsed indent)
     (save-excursion
       (skip-chars-forward " \t")
diff --git a/lisp/progmodes/ebrowse.el b/lisp/progmodes/ebrowse.el
index 4563b83389f..5ca2f09b141 100644
--- a/lisp/progmodes/ebrowse.el
+++ b/lisp/progmodes/ebrowse.el
@@ -1130,7 +1130,7 @@ If given a numeric N-TIMES argument, mark that many 
classes."
 
 (defun ebrowse-redraw-marks (start end)
   "Display class marker signs in the tree between START and END."
-  (interactive)
+  (interactive "r")
   (save-excursion
     (with-silent-modifications
       (catch 'end
@@ -1494,9 +1494,9 @@ and possibly kill the viewed buffer."
 
 
 (defun ebrowse-view-file-other-frame (file)
-  "View a file FILE in another frame.
+  "View FILE in another frame.
 The new frame is deleted when you quit viewing the file in that frame."
-  (interactive)
+  (interactive "fIn other frame view file: ")
   (let ((old-frame-configuration (current-frame-configuration))
        (had-a-buf (get-file-buffer file))
        (buf-to-view (find-file-noselect file)))
diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el
index d5c8e37a37b..2b178e50684 100644
--- a/lisp/progmodes/gud.el
+++ b/lisp/progmodes/gud.el
@@ -3150,7 +3150,7 @@ Obeying it means displaying in another window the 
specified file and line."
 
 (defun gud-basic-call (command)
   "Invoke the debugger COMMAND displaying source in other window."
-  (interactive)
+  (interactive "sInvoke debugger command: ")
   (gud-set-buffer)
   (let ((proc (get-buffer-process gud-comint-buffer)))
     (or proc (error "Current buffer has no process"))
diff --git a/lisp/speedbar.el b/lisp/speedbar.el
index 29f351ca021..0115a6f4ae4 100644
--- a/lisp/speedbar.el
+++ b/lisp/speedbar.el
@@ -3550,9 +3550,7 @@ This variable is ignored if `speedbar-use-imenu-flag' is 
t."
   "Toggle FLAG in `speedbar-fetch-etags-arguments'.
 FLAG then becomes a member of etags command line arguments.  If flag
 is \"sort\", then toggle the value of `speedbar-sort-tags'.  If its
-value is \"show\" then toggle the value of
-`speedbar-show-unknown-files'."
-  (interactive)
+value is \"show\" then toggle the value of `speedbar-show-unknown-files'."
   (cond
    ((equal flag "sort")
     (setq speedbar-sort-tags (not speedbar-sort-tags)))
diff --git a/lisp/treesit.el b/lisp/treesit.el
index 1750929cc85..1b1a7783a32 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -2753,7 +2753,6 @@ in the region."
 
 (defun treesit--explorer-jump (button)
   "Mark the original text corresponding to BUTTON."
-  (interactive)
   (when (and (derived-mode-p 'treesit--explorer-tree-mode)
              (buffer-live-p treesit--explorer-source-buffer))
     (with-current-buffer treesit--explorer-source-buffer
diff --git a/lisp/woman.el b/lisp/woman.el
index 24f23c8e8f0..e4e3d176d08 100644
--- a/lisp/woman.el
+++ b/lisp/woman.el
@@ -1846,7 +1846,6 @@ Argument EVENT is the invoking mouse event."
 
 (defun woman-reset-emulation (value)
   "Reset `woman-emulation' to VALUE and reformat, for menu use."
-  (interactive)
   (setq woman-emulation value)
   (woman-reformat-last-file))
 



reply via email to

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