aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRomain Francoise2005-10-24 11:06:03 +0000
committerRomain Francoise2005-10-24 11:06:03 +0000
commitcbfc02e4f0b8e3e24c00f0016508cc5d03be1f15 (patch)
treedd847de6c937b5ff64953fbe0d13b6faee2045ab
parent175a97e423673d7160ca85bdbbef24a5538f2ab8 (diff)
downloademacs-cbfc02e4f0b8e3e24c00f0016508cc5d03be1f15.tar.gz
emacs-cbfc02e4f0b8e3e24c00f0016508cc5d03be1f15.zip
(server-sentinel): Set query-on-exit flag to nil on new client processes
(it isn't inherited from the server process).
-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 @@
59 59
602005-10-24 Romain Francoise <romain@orebokech.com> 602005-10-24 Romain Francoise <romain@orebokech.com>
61 61
62 * server.el (server-sentinel): Set query-on-exit flag to nil on
63 new client processes (it isn't inherited from the server process).
64
62 * replace.el (occur-engine): Rearrange text properties. 65 * replace.el (occur-engine): Rearrange text properties.
63 66
642005-10-23 Stefan Monnier <monnier@iro.umontreal.ca> 672005-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.")
189 (not server-existing-buffer)) 189 (not server-existing-buffer))
190 (server-temp-file-p))) 190 (server-temp-file-p)))
191 (kill-buffer (current-buffer))))))) 191 (kill-buffer (current-buffer)))))))
192 ;; If this is a new client process, set the query-on-exit flag to nil
193 ;; for this process (it isn't inherited from the server process).
194 (when (and (eq (process-status proc) 'open)
195 (process-query-on-exit-flag proc))
196 (set-process-query-on-exit-flag proc nil))
192 (server-log (format "Status changed to %s" (process-status proc)) proc)) 197 (server-log (format "Status changed to %s" (process-status proc)) proc))
193 198
194(defun server-select-display (display) 199(defun server-select-display (display)