summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/server.el5
2 files changed, 8 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1ce55ddbcba..f57188c7879 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -59,6 +59,9 @@
2005-10-24 Romain Francoise <romain@orebokech.com>
+ * server.el (server-sentinel): Set query-on-exit flag to nil on
+ new client processes (it isn't inherited from the server process).
+
* replace.el (occur-engine): Rearrange text properties.
2005-10-23 Stefan Monnier <monnier@iro.umontreal.ca>
diff --git a/lisp/server.el b/lisp/server.el
index 3e70b78e782..ef8a3d18355 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -189,6 +189,11 @@ are done with it in the server.")
(not server-existing-buffer))
(server-temp-file-p)))
(kill-buffer (current-buffer)))))))
+ ;; If this is a new client process, set the query-on-exit flag to nil
+ ;; for this process (it isn't inherited from the server process).
+ (when (and (eq (process-status proc) 'open)
+ (process-query-on-exit-flag proc))
+ (set-process-query-on-exit-flag proc nil))
(server-log (format "Status changed to %s" (process-status proc)) proc))
(defun server-select-display (display)