[Fix #1412] Improve the nrepl-messages redirection

Never use `nil` on the name of the messages buffer.
Replies to clone requests go to the same buffer as the original request.

1 files changed, 6 insertions, 2 deletions

diff --git a/nrepl-client.el b/nrepl-client.el
index 93161ae8..a7f5bcd9 100644
--- a/nrepl-client.el
+++ b/nrepl-client.el
@@ -1266,8 +1266,12 @@ Set this to nil to prevent truncation."
 (defun nrepl-messages-buffer (msg)
   "Return or create the buffer for MSG.
 The default buffer name is *nrepl-messages session*."
-  (let* ((msg-session (nrepl-dict-get msg "session"))
-         (msg-buffer-name (format nrepl-message-buffer-name-template  msg-session)))
+  ;; Log `new-session' replies to the "orphan" buffer, because that's probably
+  ;; where we logged the request it's replying to.
+  (let* ((msg-session (or (unless (nrepl-dict-get msg "new-session")
+                            (nrepl-dict-get msg "session"))
+                          "00000000-0000-0000-0000-000000000000"))
+         (msg-buffer-name (format nrepl-message-buffer-name-template msg-session)))
     (or (get-buffer msg-buffer-name)
         (let ((buffer (get-buffer-create msg-buffer-name)))
           (with-current-buffer buffer