diff options
| author | Eli Zaretskii | 2013-09-26 10:37:16 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2013-09-26 10:37:16 +0300 |
| commit | b87c4ff2817e71ca71b028792200b1e069a95e04 (patch) | |
| tree | bfe00c0655fa02078a9ab2c633ea06d90c4a2064 /src/menu.c | |
| parent | bbc108377873aa6ed7cf21c731770103096eea39 (diff) | |
| parent | ba355de014b75ed104da4777f909db70d62f2357 (diff) | |
| download | emacs-b87c4ff2817e71ca71b028792200b1e069a95e04.tar.gz emacs-b87c4ff2817e71ca71b028792200b1e069a95e04.zip | |
Merge from trunk.
Diffstat (limited to 'src/menu.c')
| -rw-r--r-- | src/menu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/menu.c b/src/menu.c index bbd0e70fe04..5ca687f3d8a 100644 --- a/src/menu.c +++ b/src/menu.c | |||
| @@ -1317,7 +1317,7 @@ no quit occurs and `x-popup-menu' returns nil. */) | |||
| 1317 | if (current_popup_menu && FRAME_W32_P (f)) | 1317 | if (current_popup_menu && FRAME_W32_P (f)) |
| 1318 | { | 1318 | { |
| 1319 | discard_menu_items (); | 1319 | discard_menu_items (); |
| 1320 | FRAME_X_DISPLAY_INFO (f)->grabbed = 0; | 1320 | FRAME_DISPLAY_INFO (f)->grabbed = 0; |
| 1321 | UNGCPRO; | 1321 | UNGCPRO; |
| 1322 | return Qnil; | 1322 | return Qnil; |
| 1323 | } | 1323 | } |
| @@ -1365,7 +1365,7 @@ no quit occurs and `x-popup-menu' returns nil. */) | |||
| 1365 | 1365 | ||
| 1366 | #ifdef HAVE_NTGUI /* FIXME: Is it really w32-specific? --Stef */ | 1366 | #ifdef HAVE_NTGUI /* FIXME: Is it really w32-specific? --Stef */ |
| 1367 | if (FRAME_W32_P (f)) | 1367 | if (FRAME_W32_P (f)) |
| 1368 | FRAME_X_DISPLAY_INFO (f)->grabbed = 0; | 1368 | FRAME_DISPLAY_INFO (f)->grabbed = 0; |
| 1369 | #endif | 1369 | #endif |
| 1370 | 1370 | ||
| 1371 | #endif /* HAVE_MENUS */ | 1371 | #endif /* HAVE_MENUS */ |