aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/term/ns-win.el3
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 70ebcca9c91..39fe96a5848 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12011-01-26 Roy Liu <carsomyr@gmail.com> (tiny change)
2
3 * term/ns-win.el (ns-find-file): Expand ns-input-file with
4 command-line-default-directory (Bug#7872).
5
12011-01-25 Glenn Morris <rgm@gnu.org> 62011-01-25 Glenn Morris <rgm@gnu.org>
2 7
3 * comint.el (comint-mode): Doc fix. (Bug#7897) 8 * 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."
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))