From 211d6309acc3b94f37c9b555ce7de5ab8c67c7ae Mon Sep 17 00:00:00 2001
From: "Richard M. Stallman" <rms@gnu.org>
Date: Sat, 11 Mar 1995 04:37:47 +0000
Subject: [PATCH] (Info-menu): Bind beg with let.

(info): Use pop-to-buffer.
(same-window-buffer-names): Add "*info*".
---
 lisp/info.el | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lisp/info.el b/lisp/info.el
index f250957ab80..4b5d84a98cd 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -167,6 +167,9 @@ Do the right thing if the file has been compressed or zipped."
 	(let ((buffer-read-only nil))
 	  (shell-command-on-region (point-min) (point-max) decoder t)))))
 
+;;;###autoload
+(add-hook 'same-window-buffer-names "*info*")
+
 ;;;###autoload
 (defun info (&optional file)
   "Enter Info, the documentation browser.
@@ -180,7 +183,7 @@ to read a file name from the minibuffer."
   (if file
       (Info-goto-node (concat "(" file ")"))
     (if (get-buffer "*info*")
-	(switch-to-buffer "*info*")
+	(pop-to-buffer "*info*")
       (Info-directory))))
 
 ;;;###autoload
@@ -921,6 +924,7 @@ Completion is allowed, and the menu item point is on is the default."
 	 ;; If point is within a menu item, use that item as the default
 	 (default nil)
 	 (p (point))
+	 beg
 	 (last nil))
      (save-excursion
        (goto-char (point-min))