(normal-splash-screen, fancy-splash-screens-1): Add a reference to the Lisp

[gnu-emacs] / lisp / server.el

diff --git a/lisp/server.el b/lisp/server.el
index 48ff50f3dbcce2d3e5b4b62c8ab00105504a6d78..befcd22ad3afa35c2c0cc44640cc00d3ca16e865 100644 (file)
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -1,7 +1,7 @@
 ;;; server.el --- Lisp code for GNU Emacs running as server process
 
-;; Copyright (C) 1986,87,92,94,95,96,97,98,99,2000,01,02,03,2004
-;;      Free Software Foundation, Inc.
+;; Copyright (C) 1986, 1987, 1992, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+;;   2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: William Sommerfeld <wesommer@athena.mit.edu>
 ;; Maintainer: FSF
@@ -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)
@@ -338,10 +343,14 @@ PROC is the server process.  Format of STRING is \"PATH PATH PATH... \\n\"."
            (if coding-system
                (setq arg (decode-coding-string arg coding-system)))
            (if eval
-               (let ((v (eval (car (read-from-string arg)))))
+               (let* (errorp
+                      (v (condition-case errobj
+                            (eval (car (read-from-string arg)))
+                          (error (setq errorp t) errobj))))
                  (when v
                    (with-temp-buffer
                      (let ((standard-output (current-buffer)))
+                       (if errorp (princ "error: "))
                        (pp v)
                        ;; Suppress the error rose when the pipe to PROC is closed.
                        (condition-case err
@@ -371,7 +380,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))))