diff options
| author | Chong Yidong | 2011-01-31 18:54:50 -0500 |
|---|---|---|
| committer | Chong Yidong | 2011-01-31 18:54:50 -0500 |
| commit | 14beddf4711854b01d400f36166dc71eb39435bb (patch) | |
| tree | 04fd96bb0f5dcf5f3aa4e9f39a537edc61038f83 /lisp/term | |
| parent | 2a4466ca2001c29fd654420b081b780981333dc5 (diff) | |
| parent | 113ef437f21c6ea1b65abe668feb86f1622a9f2e (diff) | |
| download | emacs-14beddf4711854b01d400f36166dc71eb39435bb.tar.gz emacs-14beddf4711854b01d400f36166dc71eb39435bb.zip | |
Merge changes from emacs-23 branch
Diffstat (limited to 'lisp/term')
| -rw-r--r-- | lisp/term/ns-win.el | 4 |
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." | |||
| 487 | (defun ns-find-file () | 487 | (defun ns-find-file () |
| 488 | "Do a `find-file' with the `ns-input-file' as argument." | 488 | "Do a `find-file' with the `ns-input-file' as argument." |
| 489 | (interactive) | 489 | (interactive) |
| 490 | (let* ((f (file-truename (pop ns-input-file))) | 490 | (let* ((f (file-truename |
| 491 | (expand-file-name (pop ns-input-file) | ||
| 492 | command-line-default-directory))) | ||
| 491 | (file (find-file-noselect f)) | 493 | (file (find-file-noselect f)) |
| 492 | (bufwin1 (get-buffer-window file 'visible)) | 494 | (bufwin1 (get-buffer-window file 'visible)) |
| 493 | (bufwin2 (get-buffer-window "*scratch*" 'visibile))) | 495 | (bufwin2 (get-buffer-window "*scratch*" 'visibile))) |