--- a/lisp/ChangeLog	Sun May 20 06:00:18 2001 +0000
+++ b/lisp/ChangeLog	Sun May 20 21:36:08 2001 +0000
@@ -1,3 +1,9 @@
+2001-05-20  Adrian Aichner  <adrian@xemacs.org>
+
+	* buff-menu.el (Buffer-menu-mode): Properly make
+	`mouse-track-click-hook' local.
+	* info.el (Info-mode): Ditto.
+
 2001-05-19  Ben Wing  <ben@xemacs.org>
 
 	* autoload.el (batch-force-update-one-directory):

--- a/lisp/buff-menu.el	Sun May 20 06:00:18 2001 +0000
+++ b/lisp/buff-menu.el	Sun May 20 21:36:08 2001 +0000
@@ -140,7 +140,8 @@
   (setq revert-buffer-function 'Buffer-menu-revert-function)
   (setq truncate-lines t)
   (setq buffer-read-only t)
-  (add-hook 'mouse-track-click-hook 'Buffer-menu-maybe-mouse-select) ; XEmacs
+  (make-local-hook 'mouse-track-click-hook) ; XEmacs
+  (add-hook 'mouse-track-click-hook 'Buffer-menu-maybe-mouse-select t t) ; XEmacs
   (run-hooks 'buffer-menu-mode-hook))
 
 (defun Buffer-menu-revert-function (ignore1 ignore2)

--- a/lisp/info.el	Sun May 20 06:00:18 2001 +0000
+++ b/lisp/info.el	Sun May 20 21:36:08 2001 +0000
@@ -3018,9 +3018,9 @@
   (make-local-variable 'Info-index-alternatives)
   (make-local-variable 'Info-history)
   ;; Faces are now defined by `defface'...
-  (make-local-variable 'mouse-track-click-hook)
-  (add-hook 'mouse-track-click-hook 'Info-maybe-follow-clicked-node)
-  (add-hook 'mouse-track-click-hook 'Info-mouse-track-double-click-hook)
+  (make-local-hook 'mouse-track-click-hook)
+  (add-hook 'mouse-track-click-hook 'Info-maybe-follow-clicked-node t t)
+  (add-hook 'mouse-track-click-hook 'Info-mouse-track-double-click-hook t t)
   ;; #### The console-on-window-system-p check is to allow this to
   ;; work on tty's.  The real problem here is that featurep really
   ;; needs to have some device/console domain knowledge added to it.