Mercurial > emacs

diff src/xdisp.c @ 97267:248808aeee3e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix popup menu selection return (menu.c); add use of popup_activated under NS (nsmenu.m, xdisp.c); improve comments (lisp.h, s/darwin.h); use FORWARD_SIGNAL_TO_MAIN_THREAD (syssignal.h)
author Adrian Robert <Adrian.B.Robert@gmail.com>
date Mon, 04 Aug 2008 16:57:44 +0000
parents fe3f6c044772
children 385fa147faab
line wrap: on
line diff
--- a/src/xdisp.c	Mon Aug 04 14:39:27 2008 +0000
+++ b/src/xdisp.c	Mon Aug 04 16:57:44 2008 +0000
@@ -11349,7 +11349,7 @@
 	return;
     }
 
-#if defined (USE_X_TOOLKIT) || defined (USE_GTK)
+#if defined (USE_X_TOOLKIT) || defined (USE_GTK) || defined (HAVE_NS)
   if (popup_activated ())
     return;
 #endif
@@ -23521,7 +23521,7 @@
   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 (HAVE_NS)
   if (popup_activated ())
     return;
 #endif