summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBozhidar Batsov <bozhidar@batsov.com>2018-10-19 09:57:40 +0200
committerBozhidar Batsov <bozhidar@batsov.com>2018-10-19 09:58:14 +0200
commit9f4335294db70f7ff1283e3115308ce0aca21175 (patch)
tree6fd98f98fa6ebe0feeeb4fb5ca056dc5a483fdb9
parent47f1122b9758e1288f05dad0210e17e1b8dd81ac (diff)
Tweak some Clojure and ClojureScript references
-rw-r--r--CHANGELOG.md2
-rw-r--r--cider-connection.el2
-rw-r--r--cider.el12
3 files changed, 8 insertions, 8 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d848bde1..c3aa8f0f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -38,7 +38,7 @@
* [#2373](https://github.com/clojure-emacs/cider/issues/2373): Make it possible to configure the welcome message displayed in scratch buffers via `cider-scratch-initial-message`.
* Add the ability to jump to the profiler buffer using `cider-selector`.
* [#1980](https://github.com/clojure-emacs/cider/issues/1980): Echo back missing namespace name on interactive eval (requires nREPL 0.4.3+).
-* [#2397](https://github.com/clojure-emacs/cider/pull/2397): Add shadow-select CLJS REPL type.
+* [#2397](https://github.com/clojure-emacs/cider/pull/2397): Add shadow-select ClojureScript REPL type.
* [#2314](https://github.com/clojure-emacs/cider/pull/2314): Add `cider-ns-reload` and `cider-ns-reload-all` interactive commands.
### Bugs fixed
diff --git a/cider-connection.el b/cider-connection.el
index dd90ecd0..af94f451 100644
--- a/cider-connection.el
+++ b/cider-connection.el
@@ -577,7 +577,7 @@ Session name can be customized with `cider-session-name-template'."
;;; REPL Buffer Init
(defvar-local cider-cljs-repl-type nil
- "The type of the CLJS runtime (Nashorn, Node etc.)")
+ "The type of the ClojureScript runtime (Nashorn, Node etc.)")
(defvar-local cider-repl-type nil
"The type of this REPL buffer, usually either \"clj\" or \"cljs\".")
diff --git a/cider.el b/cider.el
index a41d4389..cefac946 100644
--- a/cider.el
+++ b/cider.el
@@ -699,7 +699,7 @@ Generally you should not disable this unless you run into some faulty check."
(user-error "The shadow-cljs ClojureScript REPL is not available")))
(defun cider-normalize-cljs-init-options (options)
- "Normalize the OPTIONS string used for initializing a CLJS REPL."
+ "Normalize the OPTIONS string used for initializing a ClojureScript REPL."
(if (or (string-prefix-p "{" options)
(string-prefix-p "(" options)
(string-prefix-p "[" options)
@@ -827,7 +827,7 @@ you're working on."
(defvar cider--select-cljs-repl-history nil)
(defun cider-select-cljs-repl (&optional default)
"Select the ClojureScript REPL to use with `cider-jack-in-cljs'.
-DEFAULT is the default CLJS REPL to offer in completion."
+DEFAULT is the default ClojureScript REPL to offer in completion."
(let ((repl-types (mapcar #'car cider-cljs-repl-types)))
(intern (completing-read "Select ClojureScript REPL type: " repl-types
nil nil nil 'cider--select-cljs-repl-history
@@ -870,7 +870,7 @@ nil."
(cider-verify-clojurescript-is-present)
(cider-verify-cljs-repl-requirements cljs-type))
(error
- (message "Invalid CLJS dependency: %S" ex)
+ (message "Invalid ClojureScript dependency: %S" ex)
nil))
(cider-verify-clojurescript-is-present)
(cider-verify-cljs-repl-requirements cljs-type)))
@@ -1034,7 +1034,7 @@ server buffer, in which case a new session for that server is created."
;;;###autoload
(defun cider-connect-clj (&optional params)
- "Initialize a CLJ connection to an nREPL server.
+ "Initialize a Clojure connection to an nREPL server.
PARAMS is a plist optionally containing :host, :port and :project-dir. On
prefix argument, prompt for all the parameters."
(interactive "P")
@@ -1049,7 +1049,7 @@ prefix argument, prompt for all the parameters."
;;;###autoload
(defun cider-connect-cljs (&optional params)
- "Initialize a CLJS connection to an nREPL server.
+ "Initialize a ClojureScript connection to an nREPL server.
PARAMS is a plist optionally containing :host, :port, :project-dir and
:cljs-repl-type (e.g. Node, Figwheel, etc). On prefix, prompt for all the
parameters regardless of their supplied or default values."
@@ -1066,7 +1066,7 @@ parameters regardless of their supplied or default values."
;;;###autoload
(defun cider-connect-clj&cljs (params &optional soft-cljs-start)
- "Initialize a CLJ and CLJS connection to an nREPL server..
+ "Initialize a Clojure and ClojureScript connection to an nREPL server.
PARAMS is a plist optionally containing :host, :port, :project-dir and
:cljs-repl-type (e.g. Node, Figwheel, etc). When SOFT-CLJS-START is
non-nil, don't start if ClojureScript requirements are not met."