diff options
| author | Joakim Verona | 2013-07-02 22:46:17 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-07-02 22:46:17 +0200 |
| commit | 3718127221fbbc31f8ebd027ab7c95403dbe9118 (patch) | |
| tree | ef422898f3344c8f94f6ecf63eb583122bbf2bd8 /src/xmenu.c | |
| parent | 1ce45b902c67b8a0dda8d71bd2812de29a9988a6 (diff) | |
| parent | a3b49114c186d84404226af75ae7905bd1cd018f (diff) | |
| download | emacs-3718127221fbbc31f8ebd027ab7c95403dbe9118.tar.gz emacs-3718127221fbbc31f8ebd027ab7c95403dbe9118.zip | |
Merge branch 'trunk' into xwidget
Conflicts:
src/window.c
Diffstat (limited to 'src/xmenu.c')
| -rw-r--r-- | src/xmenu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/xmenu.c b/src/xmenu.c index 9993bd87d5b..48ab3519723 100644 --- a/src/xmenu.c +++ b/src/xmenu.c | |||
| @@ -397,7 +397,7 @@ x_menu_wait_for_event (void *data) | |||
| 397 | else | 397 | else |
| 398 | ntp = &next_time; | 398 | ntp = &next_time; |
| 399 | 399 | ||
| 400 | #ifdef HAVE_GTK3 | 400 | #if defined USE_GTK && defined HAVE_GTK3 |
| 401 | /* Gtk3 have arrows on menus when they don't fit. When the | 401 | /* Gtk3 have arrows on menus when they don't fit. When the |
| 402 | pointer is over an arrow, a timeout scrolls it a bit. Use | 402 | pointer is over an arrow, a timeout scrolls it a bit. Use |
| 403 | xg_select so that timeout gets triggered. */ | 403 | xg_select so that timeout gets triggered. */ |