diff options
| author | Damien Cassou | 2012-12-29 14:14:00 +0800 |
|---|---|---|
| committer | Chong Yidong | 2012-12-29 14:14:00 +0800 |
| commit | 761231d1d2832a93cffad5cbf33b54fbe8333fd7 (patch) | |
| tree | 280da11f5bd066295b67184c28d52f2b7aecef78 | |
| parent | bf48a7151d68707fef532b8b0479d90170535d6d (diff) | |
| download | emacs-761231d1d2832a93cffad5cbf33b54fbe8333fd7.tar.gz emacs-761231d1d2832a93cffad5cbf33b54fbe8333fd7.zip | |
* info.el (info-other-window): New arg, for consistency with info.
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/info.el | 17 |
2 files changed, 15 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1083dc5513d..29d8462c780 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2012-12-29 Damien Cassou <damien.cassou@gmail.com> | ||
| 2 | |||
| 3 | * info.el (info-other-window): | ||
| 4 | |||
| 1 | 2012-12-28 Martin Rudalics <rudalics@gmx.at> | 5 | 2012-12-28 Martin Rudalics <rudalics@gmx.at> |
| 2 | 6 | ||
| 3 | * mail/rmail.el (rmail-maybe-display-summary): Rewrite | 7 | * mail/rmail.el (rmail-maybe-display-summary): Rewrite |
diff --git a/lisp/info.el b/lisp/info.el index 19f9212f88a..07d5c66201d 100644 --- a/lisp/info.el +++ b/lisp/info.el | |||
| @@ -746,11 +746,15 @@ in `Info-file-supports-index-cookies-list'." | |||
| 746 | (push dir Info-directory-list))))))) | 746 | (push dir Info-directory-list))))))) |
| 747 | 747 | ||
| 748 | ;;;###autoload | 748 | ;;;###autoload |
| 749 | (defun info-other-window (&optional file-or-node) | 749 | (defun info-other-window (&optional file-or-node buffer) |
| 750 | "Like `info' but show the Info buffer in another window." | 750 | "Like `info' but show the Info buffer in another window." |
| 751 | (interactive (if current-prefix-arg | 751 | (interactive (list |
| 752 | (list (read-file-name "Info file name: " nil nil t)))) | 752 | (if (and current-prefix-arg (not (numberp current-prefix-arg))) |
| 753 | (info-setup file-or-node (switch-to-buffer-other-window "*info*"))) | 753 | (read-file-name "Info file name: " nil nil t)) |
| 754 | (if (numberp current-prefix-arg) | ||
| 755 | (format "*info*<%s>" current-prefix-arg)))) | ||
| 756 | (info-setup file-or-node | ||
| 757 | (switch-to-buffer-other-window (or buffer "*info*")))) | ||
| 754 | 758 | ||
| 755 | ;;;###autoload (put 'info 'info-file (purecopy "emacs")) | 759 | ;;;###autoload (put 'info 'info-file (purecopy "emacs")) |
| 756 | ;;;###autoload | 760 | ;;;###autoload |
| @@ -767,8 +771,9 @@ with the top-level Info directory. | |||
| 767 | 771 | ||
| 768 | In interactive use, a non-numeric prefix argument directs | 772 | In interactive use, a non-numeric prefix argument directs |
| 769 | this command to read a file name from the minibuffer. | 773 | this command to read a file name from the minibuffer. |
| 770 | A numeric prefix argument selects an Info buffer with the prefix number | 774 | |
| 771 | appended to the Info buffer name. | 775 | A numeric prefix argument N selects an Info buffer named |
| 776 | \"*info*<%s>\". | ||
| 772 | 777 | ||
| 773 | The search path for Info files is in the variable `Info-directory-list'. | 778 | The search path for Info files is in the variable `Info-directory-list'. |
| 774 | The top-level Info directory is made by combining all the files named `dir' | 779 | The top-level Info directory is made by combining all the files named `dir' |