diff options
| author | Jan Djärv | 2014-07-04 17:15:02 +0200 |
|---|---|---|
| committer | Jan Djärv | 2014-07-04 17:15:02 +0200 |
| commit | 8069993ef72ba8578a84091dae1994f4d19140be (patch) | |
| tree | ea40b30acb28938634b91d5774e3ca7f1ecd5dbd /src/ChangeLog | |
| parent | 5b5953c070455773f3bdfb9ebcc7ecc15dde0611 (diff) | |
| download | emacs-8069993ef72ba8578a84091dae1994f4d19140be.tar.gz emacs-8069993ef72ba8578a84091dae1994f4d19140be.zip | |
Backport from trunk.
* xfns.c (create_frame_xic): Pass XNStatusAttributes to XCreateIC
only if xic_style calls for it. This change allows Emacs to work
with ibus. Also, don't leak resources if create_frame_xic fails,
and stop caching xic_style across different displays.
(supported_xim_styles): Make const.
(best_xim_style): Remove first parameter: it's always just
supported_xim_styles. Change to look at supported_xim_styles
directly.
Fixes: debbugs:17928
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index a88c6caacfd..3d6311c765b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,15 @@ | |||
| 1 | 2014-07-04 Daniel Colascione <dancol@dancol.org> | ||
| 2 | |||
| 3 | Backport from trunk. | ||
| 4 | * xfns.c (create_frame_xic): Pass XNStatusAttributes to XCreateIC | ||
| 5 | only if xic_style calls for it. This change allows Emacs to work | ||
| 6 | with ibus. Also, don't leak resources if create_frame_xic fails, | ||
| 7 | and stop caching xic_style across different displays (Bug#17928). | ||
| 8 | (supported_xim_styles): Make const. | ||
| 9 | (best_xim_style): Remove first parameter: it's always just | ||
| 10 | supported_xim_styles. Change to look at supported_xim_styles | ||
| 11 | directly. | ||
| 12 | |||
| 1 | 2014-07-04 Eli Zaretskii <eliz@gnu.org> | 13 | 2014-07-04 Eli Zaretskii <eliz@gnu.org> |
| 2 | 14 | ||
| 3 | * xdisp.c (redisplay_window): If redisplay of a window ends up | 15 | * xdisp.c (redisplay_window): If redisplay of a window ends up |