@@ -75,7 +75,7 @@ mode. Default is whitespace followed by 0 or 1 single-letter colon-keyword
75
75
(let ((map (copy-keymap comint-mode-map)))
76
76
(define-key map " \C -x\C -e" #'inf-clojure-eval-last-sexp )
77
77
(define-key map " \C -c\C -l" #'inf-clojure-load-file )
78
- (define-key map " \C -c\C -a" #'inf-clojure-show-arglist )
78
+ (define-key map " \C -c\C -a" #'inf-clojure-show-arglists )
79
79
(define-key map " \C -c\C -v" #'inf-clojure-show-var-documentation )
80
80
(define-key map " \C -c\C -s" #'inf-clojure-show-var-source )
81
81
(define-key map " \C -c\M -o" #'inf-clojure-clear-repl-buffer )
@@ -87,7 +87,7 @@ mode. Default is whitespace followed by 0 or 1 single-letter colon-keyword
87
87
" --"
88
88
[" Load file" inf-clojure-load-file t]
89
89
" --"
90
- [" Show arglist " inf-clojure-show-arglist t]
90
+ [" Show arglists " inf-clojure-show-arglists t]
91
91
[" Show documentation for var" inf-clojure-show-var-documentation t]
92
92
[" Show source for var" inf-clojure-show-var-source t]
93
93
" --"
@@ -112,7 +112,7 @@ mode. Default is whitespace followed by 0 or 1 single-letter colon-keyword
112
112
(define-key map " \C -c\C -A" #'inf-clojure-apropos )
113
113
(define-key map " \C -c\C -m" #'inf-clojure-macroexpand )
114
114
(define-key map " \C -c\C -l" #'inf-clojure-load-file )
115
- (define-key map " \C -c\C -a" #'inf-clojure-show-arglist )
115
+ (define-key map " \C -c\C -a" #'inf-clojure-show-arglists )
116
116
(define-key map " \C -c\C -v" #'inf-clojure-show-var-documentation )
117
117
(define-key map " \C -c\C -s" #'inf-clojure-show-var-source )
118
118
(define-key map " \C -c\M -n" #'inf-clojure-set-ns )
@@ -130,7 +130,7 @@ mode. Default is whitespace followed by 0 or 1 single-letter colon-keyword
130
130
[" Switch to REPL" inf-clojure-switch-to-repl t]
131
131
[" Set REPL ns" inf-clojure-set-ns t]
132
132
" --"
133
- [" Show arglist " inf-clojure-show-arglist t]
133
+ [" Show arglists " inf-clojure-show-arglists t]
134
134
[" Show documentation for var" inf-clojure-show-var-documentation t]
135
135
[" Show source for var" inf-clojure-show-var-source t]
136
136
[" Show vars in ns" inf-clojure-show-ns-vars t]
@@ -300,7 +300,7 @@ named `*inf-clojure*'. You can switch between the different process
300
300
buffers with \\ [switch-to-buffer].
301
301
302
302
Commands that send text from source buffers to Clojure processes --
303
- like `inf-clojure-eval-defun' or `inf-clojure-show-arglist ' -- have to choose a
303
+ like `inf-clojure-eval-defun' or `inf-clojure-show-arglists ' -- have to choose a
304
304
process to send to, when you have more than one Clojure process around. This
305
305
is determined by the global variable `inf-clojure-buffer' . Suppose you
306
306
have three inferior Clojures running:
@@ -594,7 +594,7 @@ The prefix argument SWITCH-TO-REPL controls whether to switch to REPL after the
594
594
(not (null inf-clojure-buffer)))
595
595
596
596
597
- ; ;; Documentation functions: function doc, var doc, arglist , and
597
+ ; ;; Documentation functions: function doc, var doc, arglists , and
598
598
; ;; describe symbol.
599
599
; ;; ===========================================================================
600
600
@@ -659,22 +659,22 @@ If you are using REPL types, it will pickup the most approapriate
659
659
(clojure.core/resolve
660
660
(clojure.core/read-string \" %s\" ))))
661
661
(catch Throwable t nil))\n "
662
- " Form to query inferior Clojure for a function's arglist ."
662
+ " Form to query inferior Clojure for a function's arglists ."
663
663
:type 'string
664
664
:package-version '(inf-clojure . " 2.0.0" ))
665
665
666
666
(define-obsolete-variable-alias 'inf-clojure-arglist-command 'inf-clojure-arglists-form " 2.0.0" )
667
667
668
668
(defcustom inf-clojure-arglists-form-lumo
669
669
" (lumo.repl/get-arglists \" %s\" )"
670
- " Lumo form to query inferior Clojure for a function's arglist ."
670
+ " Lumo form to query inferior Clojure for a function's arglists ."
671
671
:type 'string
672
672
:package-version '(inf-clojure . " 2.0.0" ))
673
673
674
674
(defun inf-clojure-arglists-form ()
675
675
" Return the form to query inferior Clojure for arglists of a var.
676
676
If you are using REPL types, it will pickup the most approapriate
677
- `inf-clojure-arglist -form` variant."
677
+ `inf-clojure-arglists -form` variant."
678
678
(pcase (inf-clojure--set-repl-type (inf-clojure-proc))
679
679
(`lumo inf-clojure-arglists-form-lumo)
680
680
(_ inf-clojure-arglists-form)))
@@ -857,7 +857,7 @@ The value is nil if it can't find one."
857
857
" Return the name of the symbol at point, otherwise nil."
858
858
(or (thing-at-point 'symbol ) " " ))
859
859
860
- ; ;; Documentation functions: var doc and arglist .
860
+ ; ;; Documentation functions: var doc and arglists .
861
861
; ;; ======================================================================
862
862
863
863
(defun inf-clojure-show-var-documentation (prompt-for-symbol )
@@ -884,7 +884,7 @@ prefix argument PROMPT-FOR-SYMBOL, it prompts for a symbol name."
884
884
" Return the arglists match from INPUT-FORM and STRING.
885
885
The output depends on the correct REPL type. We assume the
886
886
`inf-clojure-repl-type` var is already set, therefore this is
887
- safe to call only from inside `inf-clojure-arglist `."
887
+ safe to call only from inside `inf-clojure-arglists `."
888
888
(pcase inf-clojure-repl-type
889
889
(`lumo (let ((input-end (and (string-match input-form string) (match-end 0 ))))
890
890
(and (string-match " (.+)" string input-end) (match-string 0 string))))
@@ -926,21 +926,21 @@ the results buffer. It cuts out the output from
926
926
(when (and buffer-string (string-match inf-clojure-prompt buffer-string))
927
927
(substring buffer-string 0 (match-beginning 0 )))))))
928
928
929
- (defun inf-clojure-arglist (fn )
930
- " Send a query to the inferior Clojure for the arglist for function FN.
931
- See variable `inf-clojure-arglist -form' ."
929
+ (defun inf-clojure-arglists (fn )
930
+ " Send a query to the inferior Clojure for the arglists for function FN.
931
+ See variable `inf-clojure-arglists -form' ."
932
932
(let ((eldoc-snippet (format (inf-clojure-arglists-form) fn)))
933
933
(inf-clojure-results-from-process (inf-clojure-proc) eldoc-snippet)))
934
934
935
- (defun inf-clojure-show-arglist (prompt-for-symbol )
936
- " Show the arglist for function FN in the mini-buffer.
937
- See variable `inf-clojure-arglist -form' . When invoked with a
935
+ (defun inf-clojure-show-arglists (prompt-for-symbol )
936
+ " Show the arglists for function FN in the mini-buffer.
937
+ See variable `inf-clojure-arglists -form' . When invoked with a
938
938
prefix argument PROMPT-FOR-SYMBOL, it prompts for a symbol name."
939
939
(interactive " P" )
940
940
(let* ((fn (if prompt-for-symbol
941
- (car (inf-clojure-symprompt " Arglist " (inf-clojure-fn-called-at-pt)))
941
+ (car (inf-clojure-symprompt " Arglists " (inf-clojure-fn-called-at-pt)))
942
942
(inf-clojure-fn-called-at-pt)))
943
- (eldoc (inf-clojure-arglist fn)))
943
+ (eldoc (inf-clojure-arglists fn)))
944
944
(when eldoc
945
945
(message " %s : %s " fn eldoc))))
946
946
@@ -1094,18 +1094,18 @@ Return the number of nested sexp the point was over or after."
1094
1094
nil
1095
1095
(list (inf-clojure-symbol-at-point) argument-index)))))
1096
1096
1097
- (defun inf-clojure-eldoc-arglist (thing )
1098
- " Return the arglist for THING."
1097
+ (defun inf-clojure-eldoc-arglists (thing )
1098
+ " Return the arglists for THING."
1099
1099
(when (and thing
1100
1100
(not (string= thing " " ))
1101
1101
(not (string-prefix-p " :" thing)))
1102
1102
; ; check if we can used the cached eldoc info
1103
1103
(if (string= thing (car inf-clojure-eldoc-last-symbol))
1104
1104
(cdr inf-clojure-eldoc-last-symbol)
1105
- (let ((arglist (inf-clojure-arglist (substring-no-properties thing))))
1106
- (when arglist
1107
- (setq inf-clojure-eldoc-last-symbol (cons thing arglist ))
1108
- arglist )))))
1105
+ (let ((arglists (inf-clojure-arglists (substring-no-properties thing))))
1106
+ (when arglists
1107
+ (setq inf-clojure-eldoc-last-symbol (cons thing arglists ))
1108
+ arglists )))))
1109
1109
1110
1110
(defun inf-clojure-eldoc ()
1111
1111
" Backend function for eldoc to show argument list in the echo area."
@@ -1114,7 +1114,7 @@ Return the number of nested sexp the point was over or after."
1114
1114
(not (member last-command '(next-error previous-error))))
1115
1115
(let* ((info (inf-clojure-eldoc-info-in-current-sexp))
1116
1116
(thing (car info))
1117
- (value (inf-clojure-eldoc-arglist thing)))
1117
+ (value (inf-clojure-eldoc-arglists thing)))
1118
1118
(when value
1119
1119
(format " %s : %s "
1120
1120
(inf-clojure-eldoc-format-thing thing)
0 commit comments