* menu-bar.el (menu-bar-help-menu): Rename "psychiatrist", in line

[gnu-emacs] / lisp / server.el

diff --git a/lisp/server.el b/lisp/server.el
index 7256a729de35fbf1bff93d7dc930acea4b12c46f..ef8a3d1835577b2607f0d70ba8065c19b37ddd68 100644 (file)
--- 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)
@@ -371,7 +376,7 @@ PROC is the server process.  Format of STRING is \"PATH PATH PATH... \\n\"."
          (server-switch-buffer (nth 1 client))
          (run-hooks 'server-switch-hook)
          (unless nowait
-           (message (substitute-command-keys
+           (message "%s" (substitute-command-keys
                      "When done with a buffer, type \\[server-edit]")))))
       ;; Avoid preserving the connection after the last real frame is deleted.
       (if tmp-frame (delete-frame tmp-frame))))