Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

### Bugs fixed

* [#1153](https://github.com/clojure-emacs/cider/pull/1153): Fix behavior of `cider-switch-to-current-repl-buffer`.
* [#1139](https://github.com/clojure-emacs/cider/issues/1139): Fix evaluation of ns forms and of forms with unevaluated namespaces.
* Replace `assert` with `cl-assert` (we don't use anything from `cl` now).
* [#1135](https://github.com/clojure-emacs/cider/pull/1135): Fix a corner case with locals display in the debugger.
Expand Down
4 changes: 3 additions & 1 deletion cider-interaction.el
Original file line number Diff line number Diff line change
Expand Up @@ -406,7 +406,9 @@ of the namespace in the Clojure source buffer."
(let ((buffer (current-buffer)))
(when (eq 4 arg)
(cider-repl-set-ns (cider-current-ns)))
(pop-to-buffer (cider-get-repl-buffer))
(if cider-repl-display-in-current-window
(pop-to-buffer-same-window (cider-get-repl-buffer))
(pop-to-buffer (cider-get-repl-buffer)))
(cider-remember-clojure-buffer buffer)
(goto-char (point-max))))

Expand Down