# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1188613050 0
# Node ID 368f142b40738a114380716d04b245ec8199793c
# Parent  c2afe9e0ece9554132a45149946fbace8f589cc3
(server-process-filter): Don't display the splash screen.
It's annoying enough on the initial screen and becomes positively
obnoxious here.

diff -r c2afe9e0ece9 -r 368f142b4073 lisp/ChangeLog
--- a/lisp/ChangeLog	Sat Sep 01 02:12:37 2007 +0000
+++ b/lisp/ChangeLog	Sat Sep 01 02:17:30 2007 +0000
@@ -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 -r c2afe9e0ece9 -r 368f142b4073 lisp/server.el
--- a/lisp/server.el	Sat Sep 01 02:12:37 2007 +0000
+++ b/lisp/server.el	Sat Sep 01 02:17:30 2007 +0000
@@ -904,20 +904,6 @@
 		(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