[Fix #1077] Respect cider-repl-display-in-current-window in cider-switch-to-last-clojure-buffer

Author: bbatsov

CHANGELOG.md

@@ -98,6 +98,7 @@ when in buffer that's not visiting a file (e.g. a REPL buffer).
 * The error buffer no longer pops up when there is no error to display.
 * `cider-find-resource` now correctly throws an error when no path is provided.
 * [#946](https://github.com/clojure-emacs/cider/issues/946): `cider-stacktrace-mode` is now enabled before the error buffer is displayed.
+* [#1077](https://github.com/clojure-emacs/cider/issues/1077): Respect `cider-repl-display-in-current-window` in `cider-switch-to-last-clojure-buffer`.
 
 ## 0.8.2 / 2014-12-21
 

cider-interaction.el

@@ -487,7 +487,9 @@ Clojure buffer and the REPL buffer."
   (interactive)
   (if (and (derived-mode-p 'cider-repl-mode)
            (buffer-live-p cider-last-clojure-buffer))
-      (pop-to-buffer cider-last-clojure-buffer)
+      (if cider-repl-display-in-current-window
+          (switch-to-buffer cider-last-clojure-buffer nil t)
+        (pop-to-buffer cider-last-clojure-buffer))
     (message "Don't know the original Clojure buffer")))
 
 (defun cider-find-and-clear-repl-buffer ()