X-Git-Url: http://git.chise.org/gitweb/?p=chise%2Fxemacs-chise.git.1;a=blobdiff_plain;f=src%2Finput-method-xlib.c;h=8a1f3cad6c42db5709c878ea128c68a0e1e3d533;hp=30b30726e5fc026b2beaad46413b73576f78e511;hb=8b2e8ef2dee7da2f0d4cea712b0fc55902c3cff7;hpb=de7caee5f47b0888cb3895ce8c09d745f2fc35aa

diff --git a/src/input-method-xlib.c b/src/input-method-xlib.c
index 30b3072..8a1f3ca 100644
--- a/src/input-method-xlib.c
+++ b/src/input-method-xlib.c
@@ -426,13 +426,18 @@ XIM_init_frame (struct frame *f)
 void
 XIM_SetGeometry (struct frame *f)
 {
-  XIC      xic   = FRAME_X_XIC (f);
-  XIMStyle style = FRAME_X_XIC_STYLE (f);
+  XIC      xic;
+  XIMStyle style;
   XRectangle area;
 
-  if (!xic || !f)
+  if (!f)
+    return;
+
+  xic = FRAME_X_XIC (f);
+  if (!xic)
     return;
 
+  style = FRAME_X_XIC_STYLE (f);
   if (style & XIMStatusArea)
     {
       /* Place Status Area in bottom right corner */