(server-process-filter): Don't display the splash screen.

It's annoying enough on the initial screen and becomes positively
obnoxious here.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1f9f7d6258aca906b03552faf78ddcdf8613e5f5..3895f9510ee4b336dcde030f0b8754e5c0b1c656 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2007-09-01  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * server.el (server-process-filter): Don't display the splash screen.
+       It's annoying enough on the initial screen and becomes positively
+       obnoxious here.
+
 2007-08-31  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * emacs-lisp/avl-tree.el: Use defstruct rather than macros.

diff --git a/lisp/server.el b/lisp/server.el
index 7e761d3991ae33a7951dd4c614373a96def34f75..be2710510956d376dc0943cdcf03d8f1d5f15be3 100644 (file)
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -904,20 +904,6 @@ The following commands are accepted by the client:
                (setq buffers (server-visit-files files client nowait))
                (run-hooks 'post-command-hook))
 
-             (when frame
-               (with-selected-frame frame
-                 (display-startup-echo-area-message)
-                 (unless inhibit-splash-screen
-                   (condition-case err
-                       ;; This looks scary because `fancy-splash-screens'
-                       ;; will call `recursive-edit' from a process filter.
-                       ;; However, that should be safe to do now.
-                       (display-splash-screen t)
-                     ;; `recursive-edit' will throw an error if Emacs is
-                     ;; already doing a recursive edit elsewhere.  Catch it
-                     ;; here so that we can finish normally.
-                     (error nil)))))
-
              ;; Delete the client if necessary.
              (cond
               (nowait