[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master cac8152: Allow client connections when in recursive
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] master cac8152: Allow client connections when in recursive-edit |
Date: |
Sat, 7 Sep 2019 05:33:53 -0400 (EDT) |
branch: master
commit cac8152c8e550df634c22c0570e1fd69f2bef68c
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>
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)
---
lisp/server.el | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lisp/server.el b/lisp/server.el
index d491a26..45e3d00 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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master cac8152: Allow client connections when in recursive-edit,
Eli Zaretskii <=