aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2019-09-07 12:33:03 +0300
committerEli Zaretskii2019-09-07 12:33:03 +0300
commitcac8152c8e550df634c22c0570e1fd69f2bef68c (patch)
tree1018660cd198dfecdd26f91fae2fad70d83b1d83
parentf34f49f35e5c000a6ee070678f43d2ca38b76cad (diff)
downloademacs-cac8152c8e550df634c22c0570e1fd69f2bef68c.tar.gz
emacs-cac8152c8e550df634c22c0570e1fd69f2bef68c.zip
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)
-rw-r--r--lisp/server.el2
1 files changed, 1 insertions, 1 deletions
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
926 (isearch-cancel)))) 926 (isearch-cancel))))
927 ;; Signaled by isearch-cancel. 927 ;; Signaled by isearch-cancel.
928 (quit (message nil))) 928 (quit (message nil)))
929 (when (> (recursion-depth) 0) 929 (when (> (minibuffer-depth) 0)
930 ;; We're inside a minibuffer already, so if the emacs-client is trying 930 ;; We're inside a minibuffer already, so if the emacs-client is trying
931 ;; to open a frame on a new display, we might end up with an unusable 931 ;; to open a frame on a new display, we might end up with an unusable
932 ;; frame because input from that display will be blocked (until exiting 932 ;; frame because input from that display will be blocked (until exiting