Mercurial > hg > xemacs-beta

diff lisp/mouse.el @ 388:aabb7f5b1c81 r21-2-9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r21-2-9
author cvs
date Mon, 13 Aug 2007 11:09:42 +0200
parents 8626e4521993
children 74fd4e045ea6
line wrap: on
line diff
--- a/lisp/mouse.el	Mon Aug 13 11:08:51 2007 +0200
+++ b/lisp/mouse.el	Mon Aug 13 11:09:42 2007 +0200
@@ -1385,6 +1385,7 @@
     (cond ((extentp help)
            (or inhibit-help-echo
                (eq help last-help-echo-object) ;save some time
+	       (eq (selected-window) (minibuffer-window))
                (let ((hprop (extent-property help 'help-echo)))
                  (setq last-help-echo-object help)
                  (or (stringp hprop)
@@ -1395,11 +1396,12 @@
                 (toolbar-button-enabled-p help))
 	   (or (not toolbar-help-enabled)
 	       (eq help last-help-echo-object) ;save some time
+	       (eq (selected-window) (minibuffer-window))
 	       (let ((hstring (toolbar-button-help-string button)))
 		 (setq last-help-echo-object help)
 		 (or (stringp hstring)
 		     (setq hstring (funcall hstring help)))
-		 (show-help-echo hstring))))
+		 (and hstring (show-help-echo hstring)))))
           (last-help-echo-object
 	   (clear-help-echo)))
     (if mouse-grabbed-buffer (setq buffer mouse-grabbed-buffer))