diff options
| author | Chong Yidong | 2012-06-23 18:47:00 +0800 |
|---|---|---|
| committer | Chong Yidong | 2012-06-23 18:47:00 +0800 |
| commit | 63def6b6d1acb18d90c705687359edd4f4c2f49a (patch) | |
| tree | 496592531ac89ae9fd56f51f7b5c6a06db76072f /src | |
| parent | 388cdec072a52e1b647dec159433fd0ffe240be4 (diff) | |
| download | emacs-63def6b6d1acb18d90c705687359edd4f4c2f49a.tar.gz emacs-63def6b6d1acb18d90c705687359edd4f4c2f49a.zip | |
* xmenu.c (x_menu_wait_for_event): Adapt GTK3 to new xg_select.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/xmenu.c | 9 |
2 files changed, 8 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 27101506fa8..2266ccc49ef 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2012-06-23 Chong Yidong <cyd@gnu.org> | ||
| 2 | |||
| 3 | * xmenu.c (x_menu_wait_for_event): Adapt GTK3 to new xg_select. | ||
| 4 | |||
| 1 | 2012-06-23 Eli Zaretskii <eliz@gnu.org> | 5 | 2012-06-23 Eli Zaretskii <eliz@gnu.org> |
| 2 | 6 | ||
| 3 | Fix the MS-Windows build broken by 2012-06-22T21:17:42Z!eggert@cs.ucla.edu. | 7 | Fix the MS-Windows build broken by 2012-06-22T21:17:42Z!eggert@cs.ucla.edu. |
diff --git a/src/xmenu.c b/src/xmenu.c index 16279053e90..98b71b15f05 100644 --- a/src/xmenu.c +++ b/src/xmenu.c | |||
| @@ -411,11 +411,10 @@ x_menu_wait_for_event (void *data) | |||
| 411 | ntp = &next_time; | 411 | ntp = &next_time; |
| 412 | 412 | ||
| 413 | #ifdef HAVE_GTK3 | 413 | #ifdef HAVE_GTK3 |
| 414 | /* Gtk3 have arrows on menus when they don't fit. When the pointer is | 414 | /* Gtk3 have arrows on menus when they don't fit. When the |
| 415 | over an arrow, a timeout scrolls it a bit. Use xg_select so that | 415 | pointer is over an arrow, a timeout scrolls it a bit. Use |
| 416 | timeout gets triggered. */ | 416 | xg_select so that timeout gets triggered. */ |
| 417 | 417 | xg_select (n + 1, &read_fds, NULL, NULL, ntp, NULL); | |
| 418 | xg_select (n + 1, &read_fds, NULL, NULL, ntp); | ||
| 419 | #else | 418 | #else |
| 420 | pselect (n + 1, &read_fds, NULL, NULL, ntp, NULL); | 419 | pselect (n + 1, &read_fds, NULL, NULL, ntp, NULL); |
| 421 | #endif | 420 | #endif |