Mercurial > emacs
changeset 109880:22ddbf1e2954
(w32_wnd_proc): Don't check context before initializing.
| author | Jason Rumney <jasonr@gnu.org> |
|---|---|
| date | Thu, 19 Aug 2010 22:51:09 +0800 |
| parents | c39af0d0a834 |
| children | 3db1493a6f89 |
| files | src/ChangeLog src/w32fns.c |
| diffstat | 2 files changed, 8 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Thu Aug 19 11:37:40 2010 +0200 +++ b/src/ChangeLog Thu Aug 19 22:51:09 2010 +0800 @@ -1,3 +1,7 @@ +2010-08-19 Jason Rumney <jasonr@gnu.org> + + * w32fns.c (w32_wnd_proc): Don't check context before initializing. + 2010-08-19 Jan Djärv <jan.h.d@swipnet.se> * nsselect.m (nxatoms_of_nsselect): Use "Selection" and "Secondary".
--- a/src/w32fns.c Thu Aug 19 11:37:40 2010 +0200 +++ b/src/w32fns.c Thu Aug 19 22:51:09 2010 +0800 @@ -3109,9 +3109,6 @@ HIMC context; struct window *w; - if (!context) - break; - f = x_window_to_frame (dpyinfo, hwnd); w = XWINDOW (FRAME_SELECTED_WINDOW (f)); @@ -3129,6 +3126,10 @@ - WINDOW_MODE_LINE_HEIGHT (w)); context = get_ime_context_fn (hwnd); + + if (!context) + break; + set_ime_composition_window_fn (context, &form); release_ime_context_fn (hwnd, context); }