Commit c601a8ed authored by YAMAMOTO Mitsuharu's avatar YAMAMOTO Mitsuharu
Browse files

(redisplay_internal, note_mouse_highlight): Check

popup_activated for MAC_OS.
parent 6a0ace5b
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> 2007-03-17 Juanma Barranquero <lekktu@gmail.com>
   
* buffer.c (syms_of_buffer) <buffer-display-table>: Doc fix. * buffer.c (syms_of_buffer) <buffer-display-table>: Doc fix.
......
...@@ -10872,7 +10872,7 @@ redisplay_internal (preserve_echo_area) ...@@ -10872,7 +10872,7 @@ redisplay_internal (preserve_echo_area)
return; return;
} }
   
#if defined (USE_X_TOOLKIT) || defined (USE_GTK) #if defined (USE_X_TOOLKIT) || defined (USE_GTK) || defined (MAC_OS)
if (popup_activated ()) if (popup_activated ())
return; return;
#endif #endif
...@@ -22672,7 +22672,7 @@ note_mouse_highlight (f, x, y) ...@@ -22672,7 +22672,7 @@ note_mouse_highlight (f, x, y)
struct buffer *b; struct buffer *b;
   
/* When a menu is active, don't highlight because this looks odd. */ /* 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 ()) if (popup_activated ())
return; return;
#endif #endif
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment