Index: libx11-1.0.3/modules/im/ximcp/imThaiFlt.c
===================================================================
--- libx11-1.0.3.orig/modules/im/ximcp/imThaiFlt.c	2007-09-21 22:13:25.000000000 +0700
+++ libx11-1.0.3/modules/im/ximcp/imThaiFlt.c	2007-09-21 22:15:14.000000000 +0700
@@ -1271,7 +1271,7 @@
     XwcLookupString((XIC)ic, &ev->xkey, wbuf, sizeof(wbuf) / sizeof(wbuf[0]),
 		    &symbol, NULL);
 
-    if ((ev->xkey.state & (AllMods & ~ShiftMask)) ||
+    if ((ev->xkey.state & (AllMods & ~(ShiftMask|LockMask|Mod2Mask))) ||
          ((symbol >> 8 == 0xFF) &&
          ((XK_BackSpace <= symbol && symbol <= XK_Clear) ||
            (symbol == XK_Return) ||