diff options
| author | Karoly Lorentey <lorentey@elte.hu> | 2006-02-12 03:45:02 +0000 |
|---|---|---|
| committer | Karoly Lorentey <lorentey@elte.hu> | 2006-02-12 03:45:02 +0000 |
| commit | 8573f9ad33e99ff4fdd57eee20b86ede683f3247 (patch) | |
| tree | 64973a32b9c3f6979110114d81879fedaa9be130 /lisp/server.el | |
| parent | 4d73ec190ef402d6c7b19eccddc1e6e39422c4fd (diff) | |
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
Diffstat (limited to 'lisp/server.el')
| -rw-r--r-- | lisp/server.el | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/lisp/server.el b/lisp/server.el index 87fbf640f06..12a56599185 100644 --- a/lisp/server.el +++ b/lisp/server.el @@ -636,6 +636,10 @@ The following commands are accepted by the client: (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 @@ The following commands are accepted by the client: (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 @@ The following commands are accepted by the client: (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 |