changeset 83470:978c1cb497a7

Fix `emacsclient --eval '(progn (find-file "file")'' and the like. (Reported by Han Boetes.) * lisp/server.el (server-process-filter): Switch to *scratch* immediately after creating the frame, before evaluating any -evals. git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-510
author Karoly Lorentey <lorentey@elte.hu>
date Sun, 12 Feb 2006 03:45:02 +0000
parents 5816618f2b6d
children 08b49bab776b
files lisp/server.el
diffstat 1 files changed, 7 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/server.el	Sun Feb 12 03:15:33 2006 +0000
+++ b/lisp/server.el	Sun Feb 12 03:45:02 2006 +0000
@@ -636,6 +636,10 @@
 			  (select-frame frame)
 			  (server-client-set client 'frame frame)
 			  (server-client-set client 'terminal (frame-terminal frame))
+
+			  ;; Display *scratch* by default.
+			  (switch-to-buffer (get-buffer-create "*scratch*") 'norecord)
+
 			  (setq dontkill t))
 		      ;; This emacs does not support X.
 		      (server-log "Window system unsupported" proc)
@@ -689,6 +693,9 @@
 		      (server-client-set client 'tty (terminal-name frame))
 		      (server-client-set client 'terminal (frame-terminal frame))
 
+		      ;; Display *scratch* by default.
+		      (switch-to-buffer (get-buffer-create "*scratch*") 'norecord)
+
 		      ;; Reply with our pid.
 		      (server-send-string proc (concat "-emacs-pid " (number-to-string (emacs-pid)) "\n"))
 		      (setq dontkill t))))
@@ -753,8 +760,6 @@
 
 	      (when frame
 		(with-selected-frame frame
-		  (switch-to-buffer (or (car buffers)
-					(get-buffer-create "*scratch*")))
 		  (display-startup-echo-area-message)
 		  (unless inhibit-splash-screen
 		    (condition-case err