Merge pull request #2599 from simon-katz/stop-cursor-moving-when-initialising

Stop cursor moving when initialising the CIDER REPL

Author: cichli

CHANGELOG.md

@@ -4,6 +4,8 @@
 
 ### Bug fixes
 
+* Stop cursor moving when initialising the CIDER REPL, when `cider-repl-pop-to-buffer-on-connect` is nil. This fixes a bug introduced by [commit e0aca78b](https://github.com/clojure-emacs/cider/commit/e0aca78ba56425e50ea895c5adc7c0331cee0b19).
+
 * [#2593](https://github.com/clojure-emacs/cider/issues/2593): The REPL's initial namespace is now set correctly if configured in another tool (e.g. Leiningen's `:init-ns`).
 
 ## 0.21.0 (2019-02-19)

cider-repl.el

@@ -304,7 +304,8 @@ client process connection."
   (with-current-buffer buffer
     (cider-repl--insert-banner)
     (cider-repl--insert-prompt cider-buffer-ns)
-    (set-window-point (get-buffer-window) (point-max)))
+    (when-let ((window (get-buffer-window)))
+      (set-window-point window (point-max))))
   buffer)
 
 (defun cider-repl--insert-banner ()