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 @@
+2012-06-25  Jim Diamond  <Jim.Diamond@AcadiaU.ca>  (tiny change)
+
+        * server.el (server-process-filter): Remember dir in the
+        process's `server-client-directory' properties.
+
 2012-06-24  Chong Yidong  <cyd@gnu.org>
 
         * 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:
                  (setq dir (pop args-left))
                  (if coding-system
                      (setq dir (decode-coding-string dir coding-system)))
-                 (setq dir (command-line-normalize-file-name dir)))
+                 (setq dir (command-line-normalize-file-name dir))
+                 (process-put proc 'server-client-directory dir))
 
                 ;; Unknown command.
                 (arg (error "Unknown command: %s" arg))))