diff options
| author | Jan Djärv | 2011-01-26 19:05:13 +0100 |
|---|---|---|
| committer | Jan Djärv | 2011-01-26 19:05:13 +0100 |
| commit | ca9c274ae72514a3b06b805456e656ff5ea7d58d (patch) | |
| tree | f719a3fe5ee974c17a5f7b9c1f0a76b7ae480b83 /lisp/term | |
| parent | ea08011c7eaee19a1defe5c9880a40842ab6d28a (diff) | |
| download | emacs-ca9c274ae72514a3b06b805456e656ff5ea7d58d.tar.gz emacs-ca9c274ae72514a3b06b805456e656ff5ea7d58d.zip | |
* 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.
Diffstat (limited to 'lisp/term')
| -rw-r--r-- | lisp/term/ns-win.el | 3 |
1 files changed, 2 insertions, 1 deletions
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." | |||
| 787 | "Do a `find-file' with the `ns-input-file' as argument." | 787 | "Do a `find-file' with the `ns-input-file' as argument." |
| 788 | (interactive) | 788 | (interactive) |
| 789 | (let ((f) (file) (bufwin1) (bufwin2)) | 789 | (let ((f) (file) (bufwin1) (bufwin2)) |
| 790 | (setq f (file-truename (car ns-input-file))) | 790 | (setq f (file-truename (expand-file-name (car ns-input-file) |
| 791 | command-line-default-directory))) | ||
| 791 | (setq ns-input-file (cdr ns-input-file)) | 792 | (setq ns-input-file (cdr ns-input-file)) |
| 792 | (setq file (find-file-noselect f)) | 793 | (setq file (find-file-noselect f)) |
| 793 | (setq bufwin1 (get-buffer-window file 'visible)) | 794 | (setq bufwin1 (get-buffer-window file 'visible)) |