summaryrefslogtreecommitdiff
path: root/lisp/info.el
diff options
context:
space:
mode:
authorChong Yidong <cyd@stupidchicken.com>2011-09-10 16:14:02 -0400
committerChong Yidong <cyd@stupidchicken.com>2011-09-10 16:14:02 -0400
commit919a69aa0814937507f12851bdd277cb279faf6f (patch)
tree317310a269a8355f370307ffb0f198d69a8eb84e /lisp/info.el
parentdfb3f7559bbb4338ba01ec59e9188687a2bd7dc4 (diff)
downloademacs-919a69aa0814937507f12851bdd277cb279faf6f.tar.gz
Fix info and customize *-other-window commands.
* lisp/cus-edit.el (customize-group): New argument. (customize-group-other-window): Use it. (customize-face, customize-face-other-window): Likewise. (custom-buffer-create-other-window): Use pop-to-buffer directly. * lisp/info.el (info-setup): New function. (info-other-window, info): Call it.
Diffstat (limited to 'lisp/info.el')
-rw-r--r--lisp/info.el8
1 files changed, 5 insertions, 3 deletions
diff --git a/lisp/info.el b/lisp/info.el
index f6afeafc446..e5aa5714c72 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -610,8 +610,7 @@ in `Info-file-supports-index-cookies-list'."
"Like `info' but show the Info buffer in another window."
(interactive (if current-prefix-arg
(list (read-file-name "Info file name: " nil nil t))))
- (let (same-window-buffer-names same-window-regexps)
- (info file-or-node)))
+ (info-setup file-or-node (pop-to-buffer "*info*" t)))
;;;###autoload (put 'info 'info-file (purecopy "emacs"))
;;;###autoload
@@ -641,7 +640,10 @@ See a list of available Info commands in `Info-mode'."
(read-file-name "Info file name: " nil nil t))
(if (numberp current-prefix-arg)
(format "*info*<%s>" current-prefix-arg))))
- (pop-to-buffer (or buffer "*info*"))
+ (info-setup file-or-node (pop-to-buffer (or buffer "*info*"))))
+
+(defun info-setup (file-or-node buffer)
+ "Display Info node FILE-OR-NODE in BUFFER."
(if (and buffer (not (eq major-mode 'Info-mode)))
(Info-mode))
(if file-or-node