[Emacs-diffs] Changes to emacs/lisp/info.el

[Chong Yidong]

Index: emacs/lisp/info.el
diff -c emacs/lisp/info.el:1.447 emacs/lisp/info.el:1.448
*** emacs/lisp/info.el:1.447    Sun Oct  2 03:11:03 2005
--- emacs/lisp/info.el  Tue Oct  4 14:06:43 2005
***************
*** 1845,1880 ****
  (defun Info-next ()
    "Go to the next node of this node."
    (interactive)
!   (Info-goto-node (Info-extract-pointer "next")))
  
  (defun Info-prev ()
    "Go to the previous node of this node."
    (interactive)
!   (Info-goto-node (Info-extract-pointer "prev[ious]*" "previous")))
  
  (defun Info-up (&optional same-file)
    "Go to the superior node of this node.
  If SAME-FILE is non-nil, do not move to a different Info file."
    (interactive)
!   (let ((old-node Info-current-node)
!         (old-file Info-current-file)
!         (node (Info-extract-pointer "up")) p)
!     (and (or same-file (not (stringp Info-current-file)))
!        (string-match "^(" node)
!        (error "Up node is in another Info file"))
!     (Info-goto-node node)
!     (setq p (point))
!     (goto-char (point-min))
!     (if (and (search-forward "\n* Menu:" nil t)
!              (re-search-forward
!               (if (string-equal old-node "Top")
!                   (concat "\n\\*[^:]+: +(" (file-name-nondirectory old-file) 
")")
!                 (concat "\n\\* +\\(" (regexp-quote old-node)
!                         ":\\|[^:]+: +" (regexp-quote old-node) "\\)"))
!               nil t))
!         (progn (beginning-of-line) (if (looking-at "^\\* ") (forward-char 2)))
!       (goto-char p)
!       (Info-restore-point Info-history))))
  
  (defun Info-history-back ()
    "Go back in the history to the last node visited."
--- 1845,1889 ----
  (defun Info-next ()
    "Go to the next node of this node."
    (interactive)
!   ;; In case another window is currently selected
!   (save-window-excursion
!     (or (eq major-mode 'Info-mode) (pop-to-buffer "*info*"))
!     (Info-goto-node (Info-extract-pointer "next"))))
  
  (defun Info-prev ()
    "Go to the previous node of this node."
    (interactive)
!   ;; In case another window is currently selected
!   (save-window-excursion
!     (or (eq major-mode 'Info-mode) (pop-to-buffer "*info*"))
!     (Info-goto-node (Info-extract-pointer "prev[ious]*" "previous"))))
  
  (defun Info-up (&optional same-file)
    "Go to the superior node of this node.
  If SAME-FILE is non-nil, do not move to a different Info file."
    (interactive)
!   ;; In case another window is currently selected
!   (save-window-excursion
!     (or (eq major-mode 'Info-mode) (pop-to-buffer "*info*"))
!     (let ((old-node Info-current-node)
!         (old-file Info-current-file)
!         (node (Info-extract-pointer "up")) p)
!       (and (or same-file (not (stringp Info-current-file)))
!          (string-match "^(" node)
!          (error "Up node is in another Info file"))
!       (Info-goto-node node)
!       (setq p (point))
!       (goto-char (point-min))
!       (if (and (search-forward "\n* Menu:" nil t)
!              (re-search-forward
!               (if (string-equal old-node "Top")
!                   (concat "\n\\*[^:]+: +(" (file-name-nondirectory old-file) 
")")
!                 (concat "\n\\* +\\(" (regexp-quote old-node)
!                         ":\\|[^:]+: +" (regexp-quote old-node) "\\)"))
!               nil t))
!         (progn (beginning-of-line) (if (looking-at "^\\* ") (forward-char 2)))
!       (goto-char p)
!       (Info-restore-point Info-history)))))
  
  (defun Info-history-back ()
    "Go back in the history to the last node visited."
***************
*** 4033,4039 ****
        (save-window-excursion
        (setq completions
              (Info-speedbar-fetch-file-nodes (or node '"(dir)top"))))
!       (select-frame speedbar-frame)
        (if completions
          (speedbar-with-writable
           (dolist (completion completions)
--- 4042,4048 ----
        (save-window-excursion
        (setq completions
              (Info-speedbar-fetch-file-nodes (or node '"(dir)top"))))
!       (select-frame (speedbar-current-frame))
        (if completions
          (speedbar-with-writable
           (dolist (completion completions)