From: Richard M. Stallman <rms@gnu.org>
Date: Wed, 29 May 2002 16:38:06 +0000 (+0000)
Subject: (tooltip-mouse-motions-active): New variable.
X-Git-Tag: ttn-vms-21-2-B4~14827
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ba81b532e537cde5920d217fc4211d765886583d;p=emacs.git

(tooltip-mouse-motions-active): New variable.
(tooltip-activate-mouse-motions): Don't kill track-mouse local
if it was not made by us.
---

diff --git a/lisp/tooltip.el b/lisp/tooltip.el
index 7bdc5320626..79504156b64 100644
--- a/lisp/tooltip.el
+++ b/lisp/tooltip.el
@@ -299,16 +299,21 @@ With ARG, turn tooltip mode on if and only if ARG is positive."
 	  (tooltip-activate-mouse-motions nil))
 	(setq buffers (cdr buffers))))))
 
+(defvar tooltip-mouse-motions-active nil
+  "Locally t in a buffer if tooltip processing of mouse motion is enabled.")
 
 (defun tooltip-activate-mouse-motions (activatep)
   "Activate/deactivate mouse motion events for the current buffer.
 ACTIVATEP non-nil means activate mouse motion events."
   (if activatep
       (progn
+	(make-local-variable 'tooltip-mouse-motions-active)
+	(setq tooltip-mouse-motions-active t)
 	(make-local-variable 'track-mouse)
 	(setq track-mouse t))
-    (kill-local-variable 'track-mouse)))
-
+    (when tooltip-mouse-motions-active
+      (kill-local-variable 'tooltip-mouse-motions-active)
+      (kill-local-variable 'track-mouse))))
 
 (defun tooltip-mouse-motion (event)
   "Command handler for mouse movement events in `global-map'."