[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100417: * term/ns-win.el (ns-find-file): Expand ns-input-file with

[Jan D.]

------------------------------------------------------------
revno: 100417
committer: Jan D. <address@hidden>
branch nick: emacs-23
timestamp: Wed 2011-01-26 19:05:13 +0100
message:
  * 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.
modified:
  lisp/ChangeLog
  lisp/term/ns-win.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-01-25 03:13:02 +0000
+++ b/lisp/ChangeLog    2011-01-26 18:05:13 +0000
@@ -1,3 +1,8 @@
+2011-01-26  Roy Liu <address@hidden> (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  <address@hidden>
 
        * comint.el (comint-mode): Doc fix.  (Bug#7897)

=== modified file 'lisp/term/ns-win.el'
--- a/lisp/term/ns-win.el       2011-01-02 23:50:46 +0000
+++ b/lisp/term/ns-win.el       2011-01-26 18:05:13 +0000
@@ -787,7 +787,8 @@
   "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))