diff options
| author | Jan Djärv <jan.h.d@swipnet.se> | 2011-01-26 19:05:13 +0100 |
|---|---|---|
| committer | Jan Djärv <jan.h.d@swipnet.se> | 2011-01-26 19:05:13 +0100 |
| commit | ca9c274ae72514a3b06b805456e656ff5ea7d58d (patch) | |
| tree | f719a3fe5ee974c17a5f7b9c1f0a76b7ae480b83 | |
| parent | ea08011c7eaee19a1defe5c9880a40842ab6d28a (diff) | |
| download | emacs-ca9c274ae72514a3b06b805456e656ff5ea7d58d.tar.gz | |
* term/ns-win.el (ns-find-file): Expand ns-input-file with
command-line-default-directory (Bug#7872).
NOTE: The trunk version is a bit different, I think there will be
merge conflicts.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/term/ns-win.el | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 70ebcca9c91..39fe96a5848 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2011-01-26 Roy Liu <carsomyr@gmail.com> (tiny change) + + * term/ns-win.el (ns-find-file): Expand ns-input-file with + command-line-default-directory (Bug#7872). + 2011-01-25 Glenn Morris <rgm@gnu.org> * comint.el (comint-mode): Doc fix. (Bug#7897) diff --git a/lisp/term/ns-win.el b/lisp/term/ns-win.el index 0a4b4b15bfe..6880fdb8807 100644 --- a/lisp/term/ns-win.el +++ b/lisp/term/ns-win.el @@ -787,7 +787,8 @@ unless the current buffer is a scratch buffer." "Do a `find-file' with the `ns-input-file' as argument." (interactive) (let ((f) (file) (bufwin1) (bufwin2)) - (setq f (file-truename (car ns-input-file))) + (setq f (file-truename (expand-file-name (car ns-input-file) + command-line-default-directory))) (setq ns-input-file (cdr ns-input-file)) (setq file (find-file-noselect f)) (setq bufwin1 (get-buffer-window file 'visible)) |