* 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 70ebcca9c91a65fe424fbf497ea5b5c05168ba86..39fe96a58484dcb9c12ead359be034e0ef854215 100644 (file)
--- 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 0a4b4b15bfedbfb49de5ce2f30f63fc78665a909..6880fdb8807141d84f1529965454533e74007796 100644 (file)
--- 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))