Mercurial > emacs
comparison src/xdisp.c @ 97267:248808aeee3e
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 |
comparison
equal
deleted
inserted
replaced
| 97266:80acedef7417 | 97267:248808aeee3e |
|---|---|
| 11347 redisplay_performed_directly_p = 0; | 11347 redisplay_performed_directly_p = 0; |
| 11348 if (!hscroll_windows (selected_window)) | 11348 if (!hscroll_windows (selected_window)) |
| 11349 return; | 11349 return; |
| 11350 } | 11350 } |
| 11351 | 11351 |
| 11352 #if defined (USE_X_TOOLKIT) || defined (USE_GTK) | 11352 #if defined (USE_X_TOOLKIT) || defined (USE_GTK) || defined (HAVE_NS) |
| 11353 if (popup_activated ()) | 11353 if (popup_activated ()) |
| 11354 return; | 11354 return; |
| 11355 #endif | 11355 #endif |
| 11356 | 11356 |
| 11357 /* I don't think this happens but let's be paranoid. */ | 11357 /* I don't think this happens but let's be paranoid. */ |
| 23519 Cursor cursor = No_Cursor; | 23519 Cursor cursor = No_Cursor; |
| 23520 Lisp_Object pointer = Qnil; /* Takes precedence over cursor! */ | 23520 Lisp_Object pointer = Qnil; /* Takes precedence over cursor! */ |
| 23521 struct buffer *b; | 23521 struct buffer *b; |
| 23522 | 23522 |
| 23523 /* When a menu is active, don't highlight because this looks odd. */ | 23523 /* When a menu is active, don't highlight because this looks odd. */ |
| 23524 #if defined (USE_X_TOOLKIT) || defined (USE_GTK) | 23524 #if defined (USE_X_TOOLKIT) || defined (USE_GTK) || defined (HAVE_NS) |
| 23525 if (popup_activated ()) | 23525 if (popup_activated ()) |
| 23526 return; | 23526 return; |
| 23527 #endif | 23527 #endif |
| 23528 | 23528 |
| 23529 if (NILP (Vmouse_highlight) | 23529 if (NILP (Vmouse_highlight) |