From: YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
Date: Sun, 18 Mar 2007 08:07:17 +0000 (+0000)
Subject: (redisplay_internal, note_mouse_highlight): Check
X-Git-Tag: emacs-pretest-22.0.96~74
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c601a8ed61f7f9e5dc2f2434dc7c391440ae4ac3;p=emacs.git

(redisplay_internal, note_mouse_highlight): Check
popup_activated for MAC_OS.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index e87dbc60449..6204e5fd0d1 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,15 @@
+2007-03-18  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+	* macterm.c (note_mouse_movement): Don't return immediately for
+	LeaveNotify case.
+
+	* macmenu.c (popup_activated_flag): New variable.
+	(x_activate_menubar, mac_menu_show): Set it during menu tracking.
+	(popup_activated): New function.
+
+	* xdisp.c (redisplay_internal, note_mouse_highlight): Check
+	popup_activated for MAC_OS.
+
 2007-03-17  Juanma Barranquero  <lekktu@gmail.com>
 
 	* buffer.c (syms_of_buffer) <buffer-display-table>: Doc fix.
diff --git a/src/xdisp.c b/src/xdisp.c
index 544043f2747..c02a43d9a0c 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -10872,7 +10872,7 @@ redisplay_internal (preserve_echo_area)
 	return;
     }
 
-#if defined (USE_X_TOOLKIT) || defined (USE_GTK)
+#if defined (USE_X_TOOLKIT) || defined (USE_GTK) || defined (MAC_OS)
   if (popup_activated ())
     return;
 #endif
@@ -22672,7 +22672,7 @@ note_mouse_highlight (f, x, y)
   struct buffer *b;
 
   /* When a menu is active, don't highlight because this looks odd.  */
-#if defined (USE_X_TOOLKIT) || defined (USE_GTK)
+#if defined (USE_X_TOOLKIT) || defined (USE_GTK) || defined (MAC_OS)
   if (popup_activated ())
     return;
 #endif