diff options
| author | Vitalie Spinu <spinuvit@gmail.com> | 2018-08-28 12:38:13 +0200 |
|---|---|---|
| committer | Bozhidar Batsov <bozhidar.batsov@gmail.com> | 2018-08-30 20:51:56 +0200 |
| commit | 7e3ae962e153b7665451d3ec7d1d4f5f8935085c (patch) | |
| tree | 68c2f7313221f0d22fd779df78a0a9ad1541dd0b | |
| parent | 8bf420f72477bcf566a9f84227e0eaf860b4ba4c (diff) | |
[Fix #2418] Don't overwrite explicitly supplied params in connect-sibling-xyz
| -rw-r--r-- | cider-connection.el | 3 | ||||
| -rw-r--r-- | cider.el | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/cider-connection.el b/cider-connection.el index 67e6c390..a7a957c8 100644 --- a/cider-connection.el +++ b/cider-connection.el @@ -347,7 +347,8 @@ entire session." (let* ((repl (or repl (sesman-browser-get 'object) (cider-current-repl nil 'ensure))) - (params (thread-first (cider--gather-connect-params nil repl) + (params (thread-first () + (cider--gather-connect-params repl) (plist-put :session-name (sesman-session-name-for-object 'CIDER repl)) (plist-put :repl-buffer repl)))) (cider--close-connection repl 'no-kill) @@ -991,11 +991,12 @@ server is created." (interactive "P") (cider-nrepl-connect (let* ((other-repl (or other-repl (cider-current-repl nil 'ensure))) + (other-params (cider--gather-connect-params nil other-repl)) (ses-name (unless (nrepl-server-p other-repl) (sesman-session-name-for-object 'CIDER other-repl)))) (thread-first params (cider--update-do-prompt) - (cider--gather-connect-params other-repl) + (append other-params) (plist-put :repl-init-function nil) (plist-put :repl-type "clj") (plist-put :session-name ses-name))))) @@ -1009,12 +1010,13 @@ OTHER-REPL defaults to `cider-current-repl' but in programs can also be a server buffer, in which case a new session for that server is created." (interactive "P") (let* ((other-repl (or other-repl (cider-current-repl nil 'ensure))) + (other-params (cider--gather-connect-params nil other-repl)) (ses-name (unless (nrepl-server-p other-repl) (sesman-session-name-for-object 'CIDER other-repl)))) (cider-nrepl-connect (thread-first params (cider--update-do-prompt) - (cider--gather-connect-params other-repl) + (append other-params) (cider--update-cljs-type) (cider--update-cljs-init-function) (plist-put :session-name ses-name) |