summaryrefslogtreecommitdiff
path: root/lisp/term/ns-win.el
diff options
context:
space:
mode:
authorChong Yidong <cyd@stupidchicken.com>2011-01-31 18:54:50 -0500
committerChong Yidong <cyd@stupidchicken.com>2011-01-31 18:54:50 -0500
commit14beddf4711854b01d400f36166dc71eb39435bb (patch)
tree04fd96bb0f5dcf5f3aa4e9f39a537edc61038f83 /lisp/term/ns-win.el
parent2a4466ca2001c29fd654420b081b780981333dc5 (diff)
parent113ef437f21c6ea1b65abe668feb86f1622a9f2e (diff)
downloademacs-14beddf4711854b01d400f36166dc71eb39435bb.tar.gz
Merge changes from emacs-23 branch
Diffstat (limited to 'lisp/term/ns-win.el')
-rw-r--r--lisp/term/ns-win.el4
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/term/ns-win.el b/lisp/term/ns-win.el
index 6286b83258b..712929ecec0 100644
--- a/lisp/term/ns-win.el
+++ b/lisp/term/ns-win.el
@@ -487,7 +487,9 @@ unless the current buffer is a scratch buffer."
(defun ns-find-file ()
"Do a `find-file' with the `ns-input-file' as argument."
(interactive)
- (let* ((f (file-truename (pop ns-input-file)))
+ (let* ((f (file-truename
+ (expand-file-name (pop ns-input-file)
+ command-line-default-directory)))
(file (find-file-noselect f))
(bufwin1 (get-buffer-window file 'visible))
(bufwin2 (get-buffer-window "*scratch*" 'visibile)))