[Fix #744] Restore the ability to customize the command invoked by ci…

…der-jack-in

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
 

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