From 71e7de4769520d10f94326e12d7846e5d74bf8ee Mon Sep 17 00:00:00 2001 From: Bozhidar Batsov Date: Fri, 22 Aug 2014 14:33:22 +0300 Subject: [PATCH] [Fix #744] Restore the ability to customize the command invoked by cider-jack-in --- CHANGELOG.md | 5 +++++ cider.el | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 64f8a7019..9a1c4f177 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -45,8 +45,13 @@ bug for `tidy` namespace display. * Font-lock properly error messages in the REPL resulting from interactive evaluation. * [#671](https://github.com/clojure-emacs/cider/issues/671): Remove problematic code that was setting the REPL's initial ns based on lein's `:init-ns` option. +<<<<<<< HEAD * [#695](https://github.com/clojure-emacs/cider/issues/695): Keep point at original position when clearing or highlighting test results. +======= +* [#744](https://github.com/clojure-emacs/cider/issues/744): Fix the ability to customize the +lein command invoked by `cider-jack-in`. +>>>>>>> [Fix #744] Restore the ability to customize the command invoked by cider-jack-in ## 0.7.0 / 2014-08-05 diff --git a/cider.el b/cider.el index 79039f143..86566d044 100644 --- a/cider.el +++ b/cider.el @@ -120,7 +120,10 @@ start the server." (or project (nrepl-current-dir))))) (when (nrepl-check-for-repl-buffer nil project-dir) (let* ((nrepl-project-dir project-dir) - (cmd (format "%s %s" cider-lein-command cider-lein-parameters)) + (lein-params (if prompt-project + (read-string (format "nREPL server command: %s " cider-lein-command) cider-lein-parameters) + cider-lein-parameters)) + (cmd (format "%s %s" cider-lein-command lein-params)) (default-directory (or project-dir default-directory)) (serv-buf-name (generate-new-buffer-name (nrepl-server-buffer-name))) (process