(Info-menu): Bind beg with let.

(info): Use pop-to-buffer.
(same-window-buffer-names): Add "*info*".

diff --git a/lisp/info.el b/lisp/info.el
index f250957ab80222ffa252f4537087370b4398e956..4b5d84a98cd24cd918c9803e4f0be36ffe733f34 100644 (file)
--- 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))