aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorKim F. Storm <[email protected]>2002-03-17 20:30:19 +0000
committerKim F. Storm <[email protected]>2002-03-17 20:30:19 +0000
commit48a4a1fbe06860d88399e1d37bf69ef147537b35 (patch)
tree2e3f13acaaeeade646107dc580161f3b780c4462 /lisp
parented7069afda5f836c44a00495f61423addd1392dc (diff)
(save-buffers-kill-emacs): Also check for active server
processes. Use process-query-on-exit-flag. Only list processes which has the query-on-exit flag set in connection with user query.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/files.el10
1 files changed, 4 insertions, 6 deletions
diff --git a/lisp/files.el b/lisp/files.el
index ef44e44d84..715fbb70e6 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -1,6 +1,6 @@
;;; files.el --- file input and output commands for Emacs
-;; Copyright (C) 1985, 86, 87, 92, 93, 94, 95, 96, 97, 98, 99, 2000, 2001
+;; Copyright (C) 1985, 86, 87, 92, 93, 94, 95, 96, 97, 98, 99, 2000, 2001, 2002
;;; Free Software Foundation, Inc.
;; Maintainer: FSF
@@ -3827,14 +3827,12 @@ With prefix arg, silently save all file-visiting buffers, then kill."
(let ((processes (process-list))
active)
(while processes
- (and (memq (process-status (car processes)) '(run stop open))
- (let ((val (process-kill-without-query (car processes))))
- (process-kill-without-query (car processes) val)
- val)
+ (and (memq (process-status (car processes)) '(run stop open listen))
+ (process-query-on-exit-flag (car processes))
(setq active t))
(setq processes (cdr processes)))
(or (not active)
- (list-processes)
+ (list-processes t)
(yes-or-no-p "Active processes exist; kill them and exit anyway? "))))
;; Query the user for other things, perhaps.
(run-hook-with-args-until-failure 'kill-emacs-query-functions)