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

[Juri Linkov]

Index: emacs/lisp/info.el
diff -c emacs/lisp/info.el:1.422 emacs/lisp/info.el:1.423
*** emacs/lisp/info.el:1.422    Mon Mar 28 01:24:10 2005
--- emacs/lisp/info.el  Thu Apr  7 15:16:01 2005
***************
*** 3240,3245 ****
--- 3240,3246 ----
    (setq line-move-ignore-invisible t)
    (make-local-variable 'desktop-save-buffer)
    (setq desktop-save-buffer 'Info-desktop-buffer-misc-data)
+   (add-hook 'kill-buffer-hook 'Info-kill-buffer nil t)
    (add-hook 'clone-buffer-hook 'Info-clone-buffer-hook nil t)
    (add-hook 'change-major-mode-hook 'font-lock-defontify nil t)
    (add-hook 'isearch-mode-hook 'Info-isearch-start nil t)
***************
*** 3254,3259 ****
--- 3255,3267 ----
    (Info-set-mode-line)
    (run-hooks 'Info-mode-hook))
  
+ ;; When an Info buffer is killed, make sure the associated tags buffer
+ ;; is killed too.
+ (defun Info-kill-buffer ()
+   (and (eq major-mode 'Info-mode)
+        Info-tag-table-buffer
+        (kill-buffer Info-tag-table-buffer)))
+ 
  (defun Info-clone-buffer-hook ()
    (when (bufferp Info-tag-table-buffer)
      (setq Info-tag-table-buffer
***************
*** 3887,3902 ****
  
        (set-buffer-modified-p nil))))
  
- 
- ;; When an Info buffer is killed, make sure the associated tags buffer
- ;; is killed too.
- (defun Info-kill-buffer ()
-   (and (eq major-mode 'Info-mode)
-        Info-tag-table-buffer
-        (kill-buffer Info-tag-table-buffer)))
- 
- (add-hook 'kill-buffer-hook 'Info-kill-buffer)
- 
  ;;; Speedbar support:
  ;; These functions permit speedbar to display the "tags" in the
  ;; current info node.
--- 3895,3900 ----