Merge pull request #1519 from cap10morgan/v0.10

Bug fixes for 0.10.2

Author: bbatsov

CHANGELOG.md

@@ -1,11 +1,22 @@
 # Changelog
 
-## 0.10.1 / (unreleased)
+## 0.10.2 / (unreleased)
+
+### Changes
+
+* `cider-current-connection` actually, really considers major mode before `cider-repl-type`.
+
+### Bugs fixed
+
+* [#1521](https://github.com/clojure-emacs/cider/pull/1521): Don't assume the repl buffer is in the current frame in `cider-repl--show-maximum-output`.
+
+## 0.10.1 / 2015-01-05
 
 ### Changes
 
 * Suppress eldoc when the current sexp seems to be too large.
 * [#1500](https://github.com/clojure-emacs/cider/pull/1500): Improve the performance of REPL buffers by using text properties instead of overlays for ANSI coloring.
+* `cider-current-connection` considers major mode before `cider-repl-type`.
 
 ### Bugs fixed
 

cider-client.el

@@ -197,6 +197,14 @@ such a link cannot be established automatically."
   (cider-ensure-connected)
   (kill-local-variable 'cider-connections))
 
+(defun cider-connection-type-for-buffer ()
+  "Return the matching connection type (clj or cljs) for the current buffer."
+  (cond
+   ((derived-mode-p 'clojurescript-mode) "cljs")
+   ((derived-mode-p 'clojure-mode) "clj")
+   (cider-repl-type)
+   (t "clj")))
+
 (defun cider-current-connection (&optional type)
   "Return the REPL buffer relevant for the current Clojure source buffer.
 A REPL is relevant if its `nrepl-project-dir' is compatible with the
@@ -218,9 +226,7 @@ from the file extension."
                 ;; Only one match, just return it.
                 (car project-connections)
               ;; OW, find one matching the language of the current buffer.
-              (let ((type (or type cider-repl-type
-                              (if (derived-mode-p 'clojurescript-mode)
-                                  "cljs" "clj"))))
+              (let ((type (or type (cider-connection-type-for-buffer))))
                 (or (seq-find (lambda (conn)
                                 (equal (cider--connection-type conn) type))
                               project-connections)

cider-repl.el

@@ -392,7 +392,7 @@ This will not work on non-current prompts."
 (defun cider-repl--show-maximum-output ()
   "Put the end of the buffer at the bottom of the window."
   (when (eobp)
-    (let ((win (get-buffer-window (current-buffer))))
+    (let ((win (get-buffer-window (current-buffer) t)))
       (when win
         (with-selected-window win
           (set-window-point win (point-max))

test/cider-tests.el

@@ -254,6 +254,21 @@
   (should (string= (cider--var-namespace "a-two/var") "a-two"))
   (should (string= (cider--var-namespace "a.two-three.b/var-c") "a.two-three.b")))
 
+(ert-deftest test-cider-connection-type-for-buffer ()
+  (with-temp-buffer
+    (clojurescript-mode)
+    (should (string= (cider-connection-type-for-buffer) "cljs")))
+  (with-temp-buffer
+    (clojure-mode)
+    (should (string= (cider-connection-type-for-buffer) "clj")))
+  (with-temp-buffer
+    (let ((cider-repl-type nil))
+      (should (string= (cider-connection-type-for-buffer) "clj")))
+    (let ((cider-repl-type "clj"))
+      (should (string= (cider-connection-type-for-buffer) "clj")))
+    (let ((cider-repl-type "cljs"))
+      (should (string= (cider-connection-type-for-buffer) "cljs")))))
+
 
 ;;; response handling
 (ert-deftest test-cider-dbind-response ()