diff options
| author | YAMAMOTO Mitsuharu | 2009-10-20 10:03:46 +0000 |
|---|---|---|
| committer | YAMAMOTO Mitsuharu | 2009-10-20 10:03:46 +0000 |
| commit | 5a72cccb4cca897fe114161b5d82b02ea58d1e5c (patch) | |
| tree | 2629920b106a457d3ad5ef6a43f3d8d80a0e9862 /src | |
| parent | 1233852a801401daa0ae7da3f09575178a47eb18 (diff) | |
| download | emacs-5a72cccb4cca897fe114161b5d82b02ea58d1e5c.tar.gz emacs-5a72cccb4cca897fe114161b5d82b02ea58d1e5c.zip | |
(XTread_socket) [!USE_GTK && HAVE_X_I18N]: Don't quit
processing pending events when event is filtered for input method.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/xterm.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 45ed1940675..df814088342 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2009-10-20 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | ||
| 2 | |||
| 3 | * xterm.c (XTread_socket) [!USE_GTK && HAVE_X_I18N]: Don't quit | ||
| 4 | processing pending events when event is filtered for input method. | ||
| 5 | |||
| 1 | 2009-10-20 Juanma Barranquero <lekktu@gmail.com> | 6 | 2009-10-20 Juanma Barranquero <lekktu@gmail.com> |
| 2 | 7 | ||
| 3 | * fns.c: Add #endif accidentally removed in previous change. | 8 | * fns.c: Add #endif accidentally removed in previous change. |
diff --git a/src/xterm.c b/src/xterm.c index 97bfd5b2292..0eebb029a93 100644 --- a/src/xterm.c +++ b/src/xterm.c | |||
| @@ -7125,7 +7125,7 @@ XTread_socket (terminal, expected, hold_quit) | |||
| 7125 | #ifdef HAVE_X_I18N | 7125 | #ifdef HAVE_X_I18N |
| 7126 | /* Filter events for the current X input method. */ | 7126 | /* Filter events for the current X input method. */ |
| 7127 | if (x_filter_event (terminal->display_info.x, &event)) | 7127 | if (x_filter_event (terminal->display_info.x, &event)) |
| 7128 | break; | 7128 | continue; |
| 7129 | #endif | 7129 | #endif |
| 7130 | event_found = 1; | 7130 | event_found = 1; |
| 7131 | 7131 | ||