Skip to content

Commit db9e985

Browse files
arichiardibbatsov
authored andcommitted
Rename to arglists (plural) everywhere
1 parent 2669544 commit db9e985

File tree

1 file changed

+26
-26
lines changed

1 file changed

+26
-26
lines changed

inf-clojure.el

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ mode. Default is whitespace followed by 0 or 1 single-letter colon-keyword
7575
(let ((map (copy-keymap comint-mode-map)))
7676
(define-key map "\C-x\C-e" #'inf-clojure-eval-last-sexp)
7777
(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)
7979
(define-key map "\C-c\C-v" #'inf-clojure-show-var-documentation)
8080
(define-key map "\C-c\C-s" #'inf-clojure-show-var-source)
8181
(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
8787
"--"
8888
["Load file" inf-clojure-load-file t]
8989
"--"
90-
["Show arglist" inf-clojure-show-arglist t]
90+
["Show arglists" inf-clojure-show-arglists t]
9191
["Show documentation for var" inf-clojure-show-var-documentation t]
9292
["Show source for var" inf-clojure-show-var-source t]
9393
"--"
@@ -112,7 +112,7 @@ mode. Default is whitespace followed by 0 or 1 single-letter colon-keyword
112112
(define-key map "\C-c\C-A" #'inf-clojure-apropos)
113113
(define-key map "\C-c\C-m" #'inf-clojure-macroexpand)
114114
(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)
116116
(define-key map "\C-c\C-v" #'inf-clojure-show-var-documentation)
117117
(define-key map "\C-c\C-s" #'inf-clojure-show-var-source)
118118
(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
130130
["Switch to REPL" inf-clojure-switch-to-repl t]
131131
["Set REPL ns" inf-clojure-set-ns t]
132132
"--"
133-
["Show arglist" inf-clojure-show-arglist t]
133+
["Show arglists" inf-clojure-show-arglists t]
134134
["Show documentation for var" inf-clojure-show-var-documentation t]
135135
["Show source for var" inf-clojure-show-var-source t]
136136
["Show vars in ns" inf-clojure-show-ns-vars t]
@@ -300,7 +300,7 @@ named `*inf-clojure*'. You can switch between the different process
300300
buffers with \\[switch-to-buffer].
301301
302302
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
304304
process to send to, when you have more than one Clojure process around. This
305305
is determined by the global variable `inf-clojure-buffer'. Suppose you
306306
have three inferior Clojures running:
@@ -594,7 +594,7 @@ The prefix argument SWITCH-TO-REPL controls whether to switch to REPL after the
594594
(not (null inf-clojure-buffer)))
595595

596596

597-
;;; Documentation functions: function doc, var doc, arglist, and
597+
;;; Documentation functions: function doc, var doc, arglists, and
598598
;;; describe symbol.
599599
;;; ===========================================================================
600600

@@ -659,22 +659,22 @@ If you are using REPL types, it will pickup the most approapriate
659659
(clojure.core/resolve
660660
(clojure.core/read-string \"%s\"))))
661661
(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."
663663
:type 'string
664664
:package-version '(inf-clojure . "2.0.0"))
665665

666666
(define-obsolete-variable-alias 'inf-clojure-arglist-command 'inf-clojure-arglists-form "2.0.0")
667667

668668
(defcustom inf-clojure-arglists-form-lumo
669669
"(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."
671671
:type 'string
672672
:package-version '(inf-clojure . "2.0.0"))
673673

674674
(defun inf-clojure-arglists-form ()
675675
"Return the form to query inferior Clojure for arglists of a var.
676676
If you are using REPL types, it will pickup the most approapriate
677-
`inf-clojure-arglist-form` variant."
677+
`inf-clojure-arglists-form` variant."
678678
(pcase (inf-clojure--set-repl-type (inf-clojure-proc))
679679
(`lumo inf-clojure-arglists-form-lumo)
680680
(_ inf-clojure-arglists-form)))
@@ -857,7 +857,7 @@ The value is nil if it can't find one."
857857
"Return the name of the symbol at point, otherwise nil."
858858
(or (thing-at-point 'symbol) ""))
859859

860-
;;; Documentation functions: var doc and arglist.
860+
;;; Documentation functions: var doc and arglists.
861861
;;; ======================================================================
862862

863863
(defun inf-clojure-show-var-documentation (prompt-for-symbol)
@@ -884,7 +884,7 @@ prefix argument PROMPT-FOR-SYMBOL, it prompts for a symbol name."
884884
"Return the arglists match from INPUT-FORM and STRING.
885885
The output depends on the correct REPL type. We assume the
886886
`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`."
888888
(pcase inf-clojure-repl-type
889889
(`lumo (let ((input-end (and (string-match input-form string) (match-end 0))))
890890
(and (string-match "(.+)" string input-end) (match-string 0 string))))
@@ -926,21 +926,21 @@ the results buffer. It cuts out the output from
926926
(when (and buffer-string (string-match inf-clojure-prompt buffer-string))
927927
(substring buffer-string 0 (match-beginning 0)))))))
928928

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'."
932932
(let ((eldoc-snippet (format (inf-clojure-arglists-form) fn)))
933933
(inf-clojure-results-from-process (inf-clojure-proc) eldoc-snippet)))
934934

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
938938
prefix argument PROMPT-FOR-SYMBOL, it prompts for a symbol name."
939939
(interactive "P")
940940
(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)))
942942
(inf-clojure-fn-called-at-pt)))
943-
(eldoc (inf-clojure-arglist fn)))
943+
(eldoc (inf-clojure-arglists fn)))
944944
(when eldoc
945945
(message "%s: %s" fn eldoc))))
946946

@@ -1094,18 +1094,18 @@ Return the number of nested sexp the point was over or after."
10941094
nil
10951095
(list (inf-clojure-symbol-at-point) argument-index)))))
10961096

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."
10991099
(when (and thing
11001100
(not (string= thing ""))
11011101
(not (string-prefix-p ":" thing)))
11021102
;; check if we can used the cached eldoc info
11031103
(if (string= thing (car inf-clojure-eldoc-last-symbol))
11041104
(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)))))
11091109

11101110
(defun inf-clojure-eldoc ()
11111111
"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."
11141114
(not (member last-command '(next-error previous-error))))
11151115
(let* ((info (inf-clojure-eldoc-info-in-current-sexp))
11161116
(thing (car info))
1117-
(value (inf-clojure-eldoc-arglist thing)))
1117+
(value (inf-clojure-eldoc-arglists thing)))
11181118
(when value
11191119
(format "%s: %s"
11201120
(inf-clojure-eldoc-format-thing thing)

0 commit comments

Comments
 (0)