Mercurial > emacs

comparison src/xdisp.c @ 90650:02cf29720f31

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 490-504) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 161-163) - Update from CVS - Merge from emacs--devo--0 Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-130
author Miles Bader <miles@gnu.org>
date Tue, 07 Nov 2006 23:22:48 +0000
parents 18698239b6d8 b55c133a59f9
children f1d13e615070
comparison
equal deleted inserted replaced
90649:d53934e7ddef 90650:02cf29720f31
22933 Cursor cursor = No_Cursor; 22933 Cursor cursor = No_Cursor;
22934 Lisp_Object pointer = Qnil; /* Takes precedence over cursor! */ 22934 Lisp_Object pointer = Qnil; /* Takes precedence over cursor! */
22935 struct buffer *b; 22935 struct buffer *b;
22936 22936
22937 /* When a menu is active, don't highlight because this looks odd. */ 22937 /* When a menu is active, don't highlight because this looks odd. */
22938 #if defined (USE_X_TOOLKIT) || defined (USE_GTK) || defined (HAVE_NTGUI) 22938 #if defined (USE_X_TOOLKIT) || defined (USE_GTK)
22939 if (popup_activated ()) 22939 if (popup_activated ())
22940 return; 22940 return;
22941 #endif 22941 #endif
22942 22942
22943 if (NILP (Vmouse_highlight) 22943 if (NILP (Vmouse_highlight)