comparison lisp/server.el @ 83621:337111eac6a6

server.el: Don't change the default directory in the *scratch* buffer. * lisp/server.el (server-process-filter): Don't change default-directory in *scratch*. Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-11 Creator: Karoly Lorentey <karoly@lorentey.hu>
author Miles Bader <miles@gnu.org>
date Sun, 20 May 2007 23:27:36 +0000
parents 2716535391b7
children 3c43b53861c8
comparison
equal deleted inserted replaced
83620:ce4352d8bee9 83621:337111eac6a6
767 (server-client-set client 'frame frame) 767 (server-client-set client 'frame frame)
768 (server-client-set client 'terminal (frame-terminal frame)) 768 (server-client-set client 'terminal (frame-terminal frame))
769 769
770 ;; Display *scratch* by default. 770 ;; Display *scratch* by default.
771 (switch-to-buffer (get-buffer-create "*scratch*") 'norecord) 771 (switch-to-buffer (get-buffer-create "*scratch*") 'norecord)
772 (if dir (setq default-directory dir))
773 772
774 (setq dontkill t)) 773 (setq dontkill t))
775 ;; This emacs does not support X. 774 ;; This emacs does not support X.
776 (server-log "Window system unsupported" proc) 775 (server-log "Window system unsupported" proc)
777 (server-send-string proc "-window-system-unsupported \n") 776 (server-send-string proc "-window-system-unsupported \n")
824 (server-client-set client 'tty (terminal-name frame)) 823 (server-client-set client 'tty (terminal-name frame))
825 (server-client-set client 'terminal (frame-terminal frame)) 824 (server-client-set client 'terminal (frame-terminal frame))
826 825
827 ;; Display *scratch* by default. 826 ;; Display *scratch* by default.
828 (switch-to-buffer (get-buffer-create "*scratch*") 'norecord) 827 (switch-to-buffer (get-buffer-create "*scratch*") 'norecord)
829 (if dir (setq default-directory dir))
830 828
831 ;; Reply with our pid. 829 ;; Reply with our pid.
832 (server-send-string proc (concat "-emacs-pid " (number-to-string (emacs-pid)) "\n")) 830 (server-send-string proc (concat "-emacs-pid " (number-to-string (emacs-pid)) "\n"))
833 (setq dontkill t)))) 831 (setq dontkill t))))
834 832