* server.el (server-process-filter): Use expand-file-name rather than

command-line-normalize-file-name so as to use the `dir' when provided.
* emacsclient.c (main): Always pass cwd via "-dir".  Pass the file
names without prepending cwd to them, so Emacs uses its customary
rules to determine how to interpret the file name.

2 files changed, 4 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ee521252b96..21706156689 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2009-03-10  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+        * server.el (server-process-filter): Use expand-file-name rather than
+        command-line-normalize-file-name so as to use the `dir' when provided.
+
         * doc-view.el (doc-view-convert-current-doc): Fix last change.
 
 2009-03-10  Glenn Morris  <rgm@gnu.org>
diff --git a/lisp/server.el b/lisp/server.el
index 5e4e6e1548e..10b08ad4a3b 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -962,7 +962,7 @@ The following commands are accepted by the client:
                   (let ((file (pop command-line-args-left)))
                     (if coding-system
                         (setq file (decode-coding-string file coding-system)))
-                    (setq file (command-line-normalize-file-name file))
+                    (setq file (expand-file-name file dir))
                     (push (cons file filepos) files)
                     (server-log (format "New file: %s %s"
                                         file (or filepos "")) proc))