aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJim Diamond2012-06-25 19:01:42 -0400
committerStefan Monnier2012-06-25 19:01:42 -0400
commit8c4f2952d44e050df328eb68833889b3ddb9bbbc (patch)
treee2f399c40b98442b76bc7b4f470db386f515c924
parenta35e580cbc2ab998f114881e9f48650a83e5ad8c (diff)
downloademacs-8c4f2952d44e050df328eb68833889b3ddb9bbbc.tar.gz
emacs-8c4f2952d44e050df328eb68833889b3ddb9bbbc.zip
* lisp/server.el (server-process-filter): Remember dir in the
process's `server-client-directory' properties.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/server.el3
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a03ee8228f1..02c81a1018d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12012-06-25 Jim Diamond <Jim.Diamond@AcadiaU.ca> (tiny change)
2
3 * server.el (server-process-filter): Remember dir in the
4 process's `server-client-directory' properties.
5
12012-06-24 Chong Yidong <cyd@gnu.org> 62012-06-24 Chong Yidong <cyd@gnu.org>
2 7
3 * xml.el (xml-parse-tag): Correctly handle comment embedded in 8 * xml.el (xml-parse-tag): Correctly handle comment embedded in
diff --git a/lisp/server.el b/lisp/server.el
index 1e2f458ac9c..e17e1118847 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -1164,7 +1164,8 @@ The following commands are accepted by the client:
1164 (setq dir (pop args-left)) 1164 (setq dir (pop args-left))
1165 (if coding-system 1165 (if coding-system
1166 (setq dir (decode-coding-string dir coding-system))) 1166 (setq dir (decode-coding-string dir coding-system)))
1167 (setq dir (command-line-normalize-file-name dir))) 1167 (setq dir (command-line-normalize-file-name dir))
1168 (process-put proc 'server-client-directory dir))
1168 1169
1169 ;; Unknown command. 1170 ;; Unknown command.
1170 (arg (error "Unknown command: %s" arg)))) 1171 (arg (error "Unknown command: %s" arg))))