From: Jan Djärv <jan.h.d@swipnet.se>
Date: Wed, 26 Jan 2011 18:05:13 +0000 (+0100)
Subject: * term/ns-win.el (ns-find-file): Expand ns-input-file with
X-Git-Tag: emacs-pretest-23.2.93~22
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ca9c274ae72514a3b06b805456e656ff5ea7d58d;p=emacs.git

* 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.
---

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))