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

[Chong Yidong]

Index: emacs/lisp/info.el
diff -c emacs/lisp/info.el:1.446 emacs/lisp/info.el:1.447
*** emacs/lisp/info.el:1.446    Sat Sep 24 13:44:02 2005
--- emacs/lisp/info.el  Sun Oct  2 03:11:03 2005
***************
*** 4012,4019 ****
    (speedbar-change-initial-expansion-list "Info")
    )
  
- (eval-when-compile (defvar speedbar-attached-frame))
- 
  (defun Info-speedbar-hierarchy-buttons (directory depth &optional node)
    "Display an Info directory hierarchy in speedbar.
  DIRECTORY is the current directory in the attached frame.
--- 4012,4017 ----
***************
*** 4030,4042 ****
      ;; being known at creation time.
      (if (not node)
        (speedbar-with-writable (insert "Info Nodes:\n")))
!     (let ((completions nil)
!         (cf (selected-frame)))
!       (select-frame speedbar-attached-frame)
        (save-window-excursion
        (setq completions
              (Info-speedbar-fetch-file-nodes (or node '"(dir)top"))))
!       (select-frame cf)
        (if completions
          (speedbar-with-writable
           (dolist (completion completions)
--- 4028,4039 ----
      ;; being known at creation time.
      (if (not node)
        (speedbar-with-writable (insert "Info Nodes:\n")))
!     (let ((completions nil))
!       (speedbar-select-attached-frame)
        (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)
***************
*** 4052,4058 ****
  (defun Info-speedbar-goto-node (text node indent)
    "When user clicks on TEXT, go to an info NODE.
  The INDENT level is ignored."
!   (select-frame speedbar-attached-frame)
    (let* ((buff (or (get-buffer "*info*")
                   (progn (info) (get-buffer "*info*"))))
         (bwin (get-buffer-window buff 0)))
--- 4049,4055 ----
  (defun Info-speedbar-goto-node (text node indent)
    "When user clicks on TEXT, go to an info NODE.
  The INDENT level is ignored."
!   (speedbar-select-attached-frame)
    (let* ((buff (or (get-buffer "*info*")
                   (progn (info) (get-buffer "*info*"))))
         (bwin (get-buffer-window buff 0)))
***************
*** 4062,4068 ****
          (raise-frame (window-frame bwin)))
        (if speedbar-power-click
          (let ((pop-up-frames t)) (select-window (display-buffer buff)))
!       (select-frame speedbar-attached-frame)
        (switch-to-buffer buff)))
      (if (not (string-match "^(\\([^)]+\\))\\([^.]+\\)$" node))
        (error "Invalid node %s" node)
--- 4059,4065 ----
          (raise-frame (window-frame bwin)))
        (if speedbar-power-click
          (let ((pop-up-frames t)) (select-window (display-buffer buff)))
!       (speedbar-select-attached-frame)
        (switch-to-buffer buff)))
      (if (not (string-match "^(\\([^)]+\\))\\([^.]+\\)$" node))
        (error "Invalid node %s" node)
***************
*** 4128,4134 ****
        (nreverse completions))))
  
  ;;; Info mode node listing
! ;; FIXME: Seems not to be used.  -stef
  (defun Info-speedbar-buttons (buffer)
    "Create a speedbar display to help navigation in an Info file.
  BUFFER is the buffer speedbar is requesting buttons for."
--- 4125,4131 ----
        (nreverse completions))))
  
  ;;; Info mode node listing
! ;; This is called by `speedbar-add-localized-speedbar-support'
  (defun Info-speedbar-buttons (buffer)
    "Create a speedbar display to help navigation in an Info file.
  BUFFER is the buffer speedbar is requesting buttons for."
***************
*** 4136,4143 ****
                      (let ((case-fold-search t))
                        (not (looking-at "Info Nodes:"))))
        (erase-buffer))
!   (Info-speedbar-hierarchy-buttons nil 0)
!   )
  
  (dolist (mess '("^First node in file$"
                "^No `.*' in index$"
--- 4133,4139 ----
                      (let ((case-fold-search t))
                        (not (looking-at "Info Nodes:"))))
        (erase-buffer))
!   (Info-speedbar-hierarchy-buttons nil 0))
  
  (dolist (mess '("^First node in file$"
                "^No `.*' in index$"