* 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)
(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