Skip to content

Commit 20b42b2

Browse files
committed
Fix incorrect values.
The values for `cider-preferred-build-tool` were quoted, which resulted in the variable getting the value `(quote lein)`. This caused an error in `cider-maybe-intern` when checking the value for stringness. `cider-allow-jack-in-without-project` had a similarly quoted value, and a safe property that checked for strings, even though the value should be a symbol.
1 parent ba2ca2c commit 20b42b2

File tree

2 files changed

+14
-12
lines changed

2 files changed

+14
-12
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
### New features
66

77
### Changes
8+
* Fix values for `cider-preferred-build-tool` variable.
9+
* Fix value and safe property for `cider-allow-jack-in-without-project` variable.
810

911
### Bug fixes
1012

cider.el

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -224,11 +224,11 @@ project.clj for leiningen or build.boot for boot, could be found.
224224
As the Clojure CLI is bundled with Clojure itself, it's the default.
225225
In the absence of the Clojure CLI (e.g. on Windows), we fallback
226226
to Leiningen."
227-
:type '(choice (const 'lein)
228-
(const 'boot)
229-
(const 'clojure-cli)
230-
(const 'shadow-cljs)
231-
(const 'gradle))
227+
:type '(choice (const lein)
228+
(const boot)
229+
(const clojure-cli)
230+
(const shadow-cljs)
231+
(const gradle))
232232
:group 'cider
233233
:safe #'symbolp
234234
:package-version '(cider . "0.9.0"))
@@ -242,11 +242,11 @@ variable will suppress this behavior and will select whatever build system
242242
is indicated by the variable if present. Note, this is only when CIDER
243243
cannot decide which of many build systems to use and will never override a
244244
command when there is no ambiguity."
245-
:type '(choice (const 'lein)
246-
(const 'boot)
247-
(const 'clojure-cli)
248-
(const 'shadow-cljs)
249-
(const 'gradle)
245+
:type '(choice (const lein)
246+
(const boot)
247+
(const clojure-cli)
248+
(const shadow-cljs)
249+
(const gradle)
250250
(const :tag "Always ask" nil))
251251
:group 'cider
252252
:safe #'symbolp
@@ -258,10 +258,10 @@ When set to 'warn you'd prompted to confirm the command.
258258
When set to t `cider-jack-in' will quietly continue.
259259
When set to nil `cider-jack-in' will fail."
260260
:type '(choice (const :tag "always" t)
261-
(const 'warn)
261+
(const warn)
262262
(const :tag "never" nil))
263263
:group 'cider
264-
:safe #'stringp
264+
:safe #'symbolp
265265
:package-version '(cider . "0.15.0"))
266266

267267
(defcustom cider-known-endpoints nil

0 commit comments

Comments
 (0)