clojure-emacs
diff --git a/‎inf-clojure.el
Copy file name to clipboardExpand all lines: inf-clojure.el
+25-13Lines changed: 25 additions & 13 deletions b/‎inf-clojure.el
Copy file name to clipboardExpand all lines: inf-clojure.el
+25-13Lines changed: 25 additions & 13 deletions
@@ -230,10 +230,11 @@ This should usually be a combination of `inf-clojure-prompt' and
 `inf-clojure-subprompt'."
   :type 'regexp)
 
-(defcustom inf-clojure-prompt-on-set-ns t
+(defcustom inf-clojure-prompt-on-commands t
   "Controls whether to prompt when switching namespace."
   :type '(choice (const :tag "always" t)
-                 (const :tag "never" nil)))
+                 (const :tag "never" nil))
+  :safe 'booleanp)
 
 (defcustom inf-clojure-repl-use-same-window nil
   "Controls whether to display the REPL buffer in the current window or not."
@@ -686,19 +687,25 @@ The value is nil if it can't find one."
 (defun inf-clojure-show-var-documentation (var)
   "Send a form to the inferior Clojure to give documentation for VAR.
 See function `inf-clojure-var-doc-form'."
-  (interactive (inf-clojure-symprompt "Var doc" (inf-clojure-var-at-pt)))
+  (interactive (list (if inf-clojure-prompt-on-commands
+                         (inf-clojure-symprompt "Var doc" (inf-clojure-var-at-pt))
+                       (inf-clojure-var-at-pt))))
   (comint-proc-query (inf-clojure-proc) (format (inf-clojure-var-doc-form) var)))
 
 (defun inf-clojure-show-var-source (var)
-  "Send a form to the inferior Clojure to give source for VAR.
-See variable `inf-clojure-var-source-form'."
-  (interactive (inf-clojure-symprompt "Var source" (inf-clojure-var-at-pt)))
+  "Send a command to the inferior Clojure to give source for VAR.
+See variable `inf-clojure-var-source-command'."
+  (interactive (list (if inf-clojure-prompt-on-commands
+                         (inf-clojure-symprompt "Var source" (inf-clojure-var-at-pt))
+                       (inf-clojure-var-at-pt))))
   (comint-proc-query (inf-clojure-proc) (format inf-clojure-var-source-form var)))
 
 (defun inf-clojure-arglist (fn)
   "Send a query to the inferior Clojure for the arglist for function FN.
 See variable `inf-clojure-arglist-form'."
-  (interactive (inf-clojure-symprompt "Arglist" (inf-clojure-fn-called-at-pt)))
+  (interactive (list (if inf-clojure-prompt-on-commands
+                         (inf-clojure-symprompt "Arglist" (inf-clojure-fn-called-at-pt))
+                       (inf-clojure-fn-called-at-pt))))
   (let* ((proc (inf-clojure-proc))
          (comint-filt (process-filter proc))
          (kept "")
@@ -709,29 +716,32 @@ See variable `inf-clojure-arglist-form'."
           (process-send-string proc eldoc-snippet)
           (while (and (not (string-match inf-clojure-prompt kept))
                       (accept-process-output proc 2)))
-          (setq eldoc (and (string-match "(.+)" kept) (match-string 0 kept)))
-          )
+          (setq eldoc (and (string-match "(.+)" kept) (match-string 0 kept))))
       (set-process-filter proc comint-filt))
     eldoc))
 
 (defun inf-clojure-show-arglist (fn)
   "Show the arglist for function FN in the mini-buffer."
-  (interactive (inf-clojure-symprompt "Arglist" (inf-clojure-fn-called-at-pt)))
+  (interactive (list (if inf-clojure-prompt-on-commands
+                         (inf-clojure-symprompt "Arglist" (inf-clojure-fn-called-at-pt))
+                       (inf-clojure-fn-called-at-pt))))
   (let ((eldoc (inf-clojure-arglist fn)))
     (when eldoc
       (message "%s: %s" fn eldoc))))
 
 (defun inf-clojure-show-ns-vars (ns)
   "Send a query to the inferior Clojure for the public vars in NS.
 See variable `inf-clojure-ns-vars-form'."
-  (interactive (inf-clojure-symprompt "Ns vars" (clojure-find-ns)))
+  (interactive (list (if inf-clojure-prompt-on-commands
+                         (inf-clojure-symprompt "Ns vars" (clojure-find-ns))
+                       (clojure-find-ns))))
   (comint-proc-query (inf-clojure-proc) (format inf-clojure-ns-vars-form ns)))
 
 (defun inf-clojure-set-ns (ns)
   "Set the ns of the inferior Clojure process to NS.
 Defaults to the ns of the current buffer, always prompting before
 setting, unless `inf-clojure-prompt-on-set-ns` is nil."
-  (interactive (list (if inf-clojure-prompt-on-set-ns
+  (interactive (list (if inf-clojure-prompt-on-commands
                          (inf-clojure-symprompt "Set ns to" (clojure-find-ns))
                        (clojure-find-ns))))
   (when (or (not ns) (equal ns ""))
@@ -741,7 +751,9 @@ setting, unless `inf-clojure-prompt-on-set-ns` is nil."
 (defun inf-clojure-apropos (var)
   "Send a form to the inferior Clojure to give apropos for VAR.
 See variable `inf-clojure-apropos-form'."
-  (interactive (inf-clojure-symprompt "Var apropos" (inf-clojure-var-at-pt)))
+  (interactive (list (if inf-clojure-prompt-on-commands
+                         (inf-clojure-symprompt "Var apropos" (inf-clojure-var-at-pt))
+                       (inf-clojure-var-at-pt))))
   (comint-proc-query (inf-clojure-proc) (format inf-clojure-apropos-form var)))
 
 (defun inf-clojure-macroexpand (&optional macro-1)