summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog.multi-tty5
-rw-r--r--lisp/server.el2
2 files changed, 5 insertions, 2 deletions
diff --git a/lisp/ChangeLog.multi-tty b/lisp/ChangeLog.multi-tty
index bdcd367a195..c5b6013fa39 100644
--- a/lisp/ChangeLog.multi-tty
+++ b/lisp/ChangeLog.multi-tty
@@ -1,3 +1,8 @@
+2007-05-20 L$,1 q(Brentey K,Aa(Broly <lorentey@elte.hu>
+
+ * lisp/server.el (server-process-filter): Don't change
+ default-directory in *scratch*.
+
2007-05-19 Dan Nicolaescu <dann@ics.uci.edu>
* term/mac-win.el: Provide mac-win.
diff --git a/lisp/server.el b/lisp/server.el
index 15721d1af1c..01acabf1ec8 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -769,7 +769,6 @@ The following commands are accepted by the client:
;; Display *scratch* by default.
(switch-to-buffer (get-buffer-create "*scratch*") 'norecord)
- (if dir (setq default-directory dir))
(setq dontkill t))
;; This emacs does not support X.
@@ -826,7 +825,6 @@ The following commands are accepted by the client:
;; Display *scratch* by default.
(switch-to-buffer (get-buffer-create "*scratch*") 'norecord)
- (if dir (setq default-directory dir))
;; Reply with our pid.
(server-send-string proc (concat "-emacs-pid " (number-to-string (emacs-pid)) "\n"))