From e5ccf0c17e403f3a8cbf8968febf904245043526 Mon Sep 17 00:00:00 2001
From: Karl Heuer <kwzh@gnu.org>
Date: Thu, 3 Mar 1994 21:13:08 +0000
Subject: [PATCH] (server-switch-buffer): Don't select a minibuffer.

---
 lisp/server.el | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lisp/server.el b/lisp/server.el
index 57b47c196ec..75655093542 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -326,6 +326,8 @@ Arg NEXT-BUFFER is a suggestion; if it is a live buffer, use it."
 	 (select-window server-window))
 	((framep server-window)
 	 (select-window (frame-selected-window server-window))))
+  (if (window-minibuffer-p (selected-window))
+      (select-window (next-window nil 'nomini t)))
   (if next-buffer
       (if (and (bufferp next-buffer)
 	       (buffer-name next-buffer))
-- 
2.39.5