From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 7 Sep 2019 09:33:03 +0000 (+0300)
Subject: Allow client connections when in recursive-edit
X-Git-Tag: emacs-27.0.90~1553^2~18
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=cac8152c8e550df634c22c0570e1fd69f2bef68c;p=emacs.git

Allow client connections when in recursive-edit

* lisp/server.el (server-goto-toplevel): Check minibuffer
depth, not recursion depth.  This avoids exiting
recursive-edit if a client connection is accepted during
recursive-edit.  (Bug#37176)
---

diff --git a/lisp/server.el b/lisp/server.el
index d491a260377..45e3d007e45 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -926,7 +926,7 @@ This handles splitting the command if it would be bigger than
             (isearch-cancel))))
     ;; Signaled by isearch-cancel.
     (quit (message nil)))
-  (when (> (recursion-depth) 0)
+  (when (> (minibuffer-depth) 0)
     ;; We're inside a minibuffer already, so if the emacs-client is trying
     ;; to open a frame on a new display, we might end up with an unusable
     ;; frame because input from that display will be blocked (until exiting