diff options
| author | Stefan Monnier <[email protected]> | 2009-03-10 14:08:52 +0000 |
|---|---|---|
| committer | Stefan Monnier <[email protected]> | 2009-03-10 14:08:52 +0000 |
| commit | ba528748a14a34d2c3f619615c4cdaf4bbd89cc0 (patch) | |
| tree | 16c988a41705f78fff35c619216e2f4d73af838d /lisp | |
| parent | bba79a9ce446856701d58cdeb26488b6a0b87864 (diff) | |
* 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.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/server.el | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ee521252b9..2170615668 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2009-03-10 Stefan Monnier <[email protected]> + * 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 <[email protected]> diff --git a/lisp/server.el b/lisp/server.el index 5e4e6e1548..10b08ad4a3 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)) |