diff options
| author | Paul Eggert | 2011-06-11 20:53:12 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-06-11 20:53:12 -0700 |
| commit | 73dba34265faf12a46cef1edabe066af3159122a (patch) | |
| tree | ff15c998b1b46ef4b6746b76ceae059c31309a37 /src | |
| parent | 8eeb28635aafbbba375bc54cbccba2137d5a7aa2 (diff) | |
| download | emacs-73dba34265faf12a46cef1edabe066af3159122a.tar.gz emacs-73dba34265faf12a46cef1edabe066af3159122a.zip | |
* xmenu.c (x_menu_set_in_use): Fix incorrect assumption.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/xmenu.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index a1e5f3a2200..db1f1c82f35 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -21,8 +21,6 @@ | |||
| 21 | (compare_window_configurations): Remove unused locals. | 21 | (compare_window_configurations): Remove unused locals. |
| 22 | * xfns.c (x_set_scroll_bar_default_width): Remove unused locals. | 22 | * xfns.c (x_set_scroll_bar_default_width): Remove unused locals. |
| 23 | * xmenu.c (x_menu_set_in_use): Define only if USE_GTK || USE_MOTIF. | 23 | * xmenu.c (x_menu_set_in_use): Define only if USE_GTK || USE_MOTIF. |
| 24 | Omit no-longer-needed #ifdef USE_X_TOOLKIT, since USE_X_TOOLKIT is | ||
| 25 | implied by USE_GTK || USE_MOTIF. | ||
| 26 | (dialog_selection_callback) [!USE_GTK]: Prefer intptr_t for integers | 24 | (dialog_selection_callback) [!USE_GTK]: Prefer intptr_t for integers |
| 27 | the same widths as pointers. This follows up on the 2011-05-06 patch. | 25 | the same widths as pointers. This follows up on the 2011-05-06 patch. |
| 28 | * xterm.c (x_alloc_lighter_color_for_widget): Define only if USE_LUCID. | 26 | * xterm.c (x_alloc_lighter_color_for_widget): Define only if USE_LUCID. |
diff --git a/src/xmenu.c b/src/xmenu.c index db1d8823a7e..1cb71187c0c 100644 --- a/src/xmenu.c +++ b/src/xmenu.c | |||
| @@ -356,8 +356,10 @@ x_menu_set_in_use (int in_use) | |||
| 356 | { | 356 | { |
| 357 | menu_items_inuse = in_use ? Qt : Qnil; | 357 | menu_items_inuse = in_use ? Qt : Qnil; |
| 358 | popup_activated_flag = in_use; | 358 | popup_activated_flag = in_use; |
| 359 | #ifdef USE_X_TOOLKIT | ||
| 359 | if (popup_activated_flag) | 360 | if (popup_activated_flag) |
| 360 | x_activate_timeout_atimer (); | 361 | x_activate_timeout_atimer (); |
| 362 | #endif | ||
| 361 | } | 363 | } |
| 362 | 364 | ||
| 363 | #endif | 365 | #endif |