[Emacs-diffs] /srv/bzr/emacs/trunk r101137: (w32_wnd_proc): Don't check context before initializing.

[Jason Rumney]

------------------------------------------------------------
revno: 101137
committer: Jason Rumney <address@hidden>
branch nick: trunk
timestamp: Thu 2010-08-19 22:51:09 +0800
message:
  (w32_wnd_proc): Don't check context before initializing.
modified:
  src/ChangeLog
  src/w32fns.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-08-19 05:55:30 +0000
+++ b/src/ChangeLog     2010-08-19 14:51:09 +0000
@@ -1,3 +1,7 @@
+2010-08-19  Jason Rumney  <address@hidden>
+
+       * w32fns.c (w32_wnd_proc): Don't check context before initializing.
+
 2010-08-19  Jan Djärv  <address@hidden>
 
        * nsselect.m (nxatoms_of_nsselect): Use "Selection" and "Secondary".

=== modified file 'src/w32fns.c'
--- a/src/w32fns.c      2010-08-17 20:05:50 +0000
+++ b/src/w32fns.c      2010-08-19 14:51:09 +0000
@@ -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);
        }