Skip to content

Commit 1c9f9e3

Browse files
vspinubbatsov
authored andcommitted
Rename cider-describe-current-connection -> cider-describe-connection
.. because it accepts an explicit REPL argument now.
1 parent d4cd579 commit 1c9f9e3

File tree

7 files changed

+11
-10
lines changed

7 files changed

+11
-10
lines changed

cider-connection.el

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ REPL defaults to the current REPL."
335335

336336
(defun cider-restart (&optional repl)
337337
"Restart CIDER connection associated with REPL.
338-
REPL defaults to the current REPL. Don't restart the server or other
338+
REPL defaults to the current REPL. Don't restart the server or other
339339
connections within the same session. Use `sesman-restart' to restart the
340340
entire session."
341341
(interactive)
@@ -710,7 +710,7 @@ Error is signaled if no REPL buffer of specified type exists."
710710
(define-obsolete-function-alias 'cider-repl-buffers 'cider-repls "0.18")
711711
(define-obsolete-function-alias 'cider-current-session 'cider-nrepl-eval-session "0.18")
712712
(define-obsolete-function-alias 'cider-current-tooling-session 'cider-nrepl-tooling-session "0.18")
713-
(define-obsolete-function-alias 'cider-display-connection-info 'cider-describe-current-connection "0.18")
713+
(define-obsolete-function-alias 'cider-display-connection-info 'cider-describe-connection "0.18")
714714
(define-obsolete-function-alias 'nrepl-connection-buffer-name 'nrepl-repl-buffer-name "0.18")
715715
(define-obsolete-function-alias 'cider-repl-set-type 'cider-set-repl-type "0.18")
716716

cider-mode.el

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ If invoked with a prefix ARG eval the expression after inserting it."
297297
["Quit" cider-quit :active (cider-connected-p)]
298298
["Restart" cider-restart :active (cider-connected-p)]
299299
"--"
300-
["Connection info" cider-describe-current-connection
300+
["Connection info" cider-describe-connection
301301
:active (cider-connected-p)]
302302
["Select any CIDER buffer" cider-selector]
303303
"--"
@@ -492,7 +492,7 @@ As it stands Emacs fires these events on <mouse-8> and <mouse-9> on 'x' and
492492
(define-key map (kbd "C-c ,") 'cider-test-commands-map)
493493
(define-key map (kbd "C-c C-t") 'cider-test-commands-map)
494494
(define-key map (kbd "C-c M-s") #'cider-selector)
495-
(define-key map (kbd "C-c M-d") #'cider-describe-current-connection)
495+
(define-key map (kbd "C-c M-d") #'cider-describe-connection)
496496
(define-key map (kbd "C-c C-=") 'cider-profile-map)
497497
(define-key map (kbd "C-c C-q") #'cider-quit)
498498
(define-key map (kbd "C-c M-r") #'cider-restart)

cider-repl.el

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1511,7 +1511,7 @@ constructs."
15111511
(cider-repl-add-shortcut "test-project-with-filters" (lambda () (interactive) (cider-test-run-project-tests 'prompt-for-filters)))
15121512
(cider-repl-add-shortcut "test-report" #'cider-test-show-report)
15131513
(cider-repl-add-shortcut "run" #'cider-run)
1514-
(cider-repl-add-shortcut "conn-info" #'cider-describe-current-connection)
1514+
(cider-repl-add-shortcut "conn-info" #'cider-describe-connection)
15151515
(cider-repl-add-shortcut "hasta la vista" #'cider-quit)
15161516
(cider-repl-add-shortcut "adios" #'cider-quit)
15171517
(cider-repl-add-shortcut "sayonara" #'cider-quit)
@@ -1614,7 +1614,7 @@ constructs."
16141614
(define-key map (kbd "C-c C-z") #'cider-switch-to-last-clojure-buffer)
16151615
(define-key map (kbd "C-c M-o") #'cider-repl-switch-to-other)
16161616
(define-key map (kbd "C-c M-s") #'cider-selector)
1617-
(define-key map (kbd "C-c M-d") #'cider-describe-current-connection)
1617+
(define-key map (kbd "C-c M-d") #'cider-describe-connection)
16181618
(define-key map (kbd "C-c C-q") #'cider-quit)
16191619
(define-key map (kbd "C-c M-r") #'cider-restart)
16201620
(define-key map (kbd "C-c M-i") #'cider-inspect)
@@ -1681,7 +1681,7 @@ constructs."
16811681
"--"
16821682
["Interrupt evaluation" cider-interrupt]
16831683
"--"
1684-
["Connection info" cider-describe-current-connection]
1684+
["Connection info" cider-describe-connection]
16851685
"--"
16861686
["Close ancillary buffers" cider-close-ancillary-buffers]
16871687
["Quit" cider-quit]

cider-selector.el

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
(require 'cider-client)
3535
(require 'cider-eval)
3636
(require 'cider-scratch)
37+
(require 'cider-profile)
3738

3839
(defconst cider-selector-help-buffer "*CIDER Selector Help*"
3940
"The name of the selector's help buffer.")

cider-util.el

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -761,7 +761,7 @@ through a stack of help buffers. Variables `help-back-label' and
761761
"Press <C-u C-u \\[cider-inspect]> to read Clojure code from the minibuffer and inspect its result."
762762
"Press <\\[cider-ns-refresh]> to reload modified and unloaded namespaces."
763763
"You can define Clojure functions to be called before and after `cider-ns-refresh' (see `cider-ns-refresh-before-fn' and `cider-ns-refresh-after-fn'."
764-
"Press <\\[cider-describe-current-connection]> to view information about the connection."
764+
"Press <\\[cider-describe-connection]> to view information about the connection."
765765
"Press <\\[cider-undef]> to undefine a symbol in the current namespace."
766766
"Press <\\[cider-interrupt]> to interrupt an ongoing evaluation."
767767
"Use <M-x customize-group RET cider RET> to see every possible setting you can customize."

doc/cider-refcard.tex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ \section{REPL control}
125125
\item[C-c M-p] cider-insert-last-sexp-in-repl
126126
\item[C-c C-z] cider-switch-to-repl-buffer
127127
\item[C-c M-o] cider-find-and-clear-repl-buffer
128-
\item[C-c M-d] cider-describe-current-connection
128+
\item[C-c M-d] cider-describe-connection
129129
\item[C-c M-n M-n] cider-repl-set-ns
130130
\item[C-c C-b] cider-interrupt
131131
\item[C-c M-n M-r] cider-ns-refresh

doc/interactive_programming.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Here's a list of `cider-mode`'s keybindings:
3737
`cider-switch-to-repl-buffer` |<kbd>C-c C-z</kbd> | Switch to the relevant REPL buffer. Use a prefix argument to change the namespace of the REPL buffer to match the currently visited source file.
3838
`cider-switch-to-repl-buffer` |<kbd>C-u C-u C-c C-z</kbd> | Switch to the REPL buffer based on a user prompt for a directory.
3939
`cider-load-buffer-and-switch-to-repl-buffer` |<kbd>C-c M-z</kbd> | Load (eval) the current buffer and switch to the relevant REPL buffer. Use a prefix argument to change the namespace of the REPL buffer to match the currently visited source file.
40-
`cider-describe-current-connection` |<kbd>C-c M-d</kbd> | Display default REPL connection details, including project directory name, buffer namespace, host and port.
40+
`cider-describe-connection` |<kbd>C-c M-d</kbd> | Display default REPL connection details, including project directory name, buffer namespace, host and port.
4141
`cider-find-and-clear-repl-output` |<kbd>C-c C-o</kbd> | Clear the last output in the REPL buffer. With a prefix argument it will clear the entire REPL buffer, leaving only a prompt. Useful if you're running the REPL buffer in a side by side buffer.
4242
`cider-load-buffer` |<kbd>C-c C-k</kbd> | Load (eval) the current buffer.
4343
`cider-load-file` |<kbd>C-c C-l</kbd> | Load (eval) a Clojure file.

0 commit comments

Comments
 (0)