Index: lib/X11/FilterEv.c
===================================================================
RCS file: /cvs/xorg/xc/lib/X11/FilterEv.c,v
retrieving revision 1.4
diff -u -p -r1.4 FilterEv.c
--- lib/X11/FilterEv.c	11 Jul 2005 09:18:31 -0000	1.4
+++ lib/X11/FilterEv.c	21 Oct 2005 16:02:03 -0000
@@ -96,9 +96,9 @@ XFilterEvent(ev, window)
 	if (win == p->window) {
 	    if ((mask & p->event_mask) ||
 		(ev->type >= p->start_type && ev->type <= p->end_type)) {
+		UnlockDisplay(ev->xany.display);
 		ret = (*(p->filter))(ev->xany.display, p->window, ev,
 				      p->client_data);
-		UnlockDisplay(ev->xany.display);
 		return(ret);
 	    }
 	}
Index: lib/X11/imDefLkup.c
===================================================================
RCS file: /cvs/xorg/xc/lib/X11/imDefLkup.c,v
retrieving revision 1.4
diff -u -p -r1.4 imDefLkup.c
--- lib/X11/imDefLkup.c	13 May 2005 22:53:44 -0000	1.4
+++ lib/X11/imDefLkup.c	21 Oct 2005 16:02:03 -0000
@@ -466,7 +466,7 @@ _XimGetWindowEventmask(
     Xim			im = (Xim )ic->core.im;
     XWindowAttributes	atr;
 
-    if (!_XGetWindowAttributes(im->core.display, ic->core.focus_window, &atr))
+    if (!XGetWindowAttributes(im->core.display, ic->core.focus_window, &atr))
 	return 0;
     return (EVENTMASK)atr.your_event_mask;
 }
Index: lib/X11/imLcFlt.c
===================================================================
RCS file: /cvs/xorg/xc/lib/X11/imLcFlt.c,v
retrieving revision 1.3
diff -u -p -r1.3 imLcFlt.c
--- lib/X11/imLcFlt.c	13 May 2005 22:53:44 -0000	1.3
+++ lib/X11/imLcFlt.c	21 Oct 2005 16:02:03 -0000
@@ -76,7 +76,7 @@ _XimLocalFilter(d, w, ev, client_data)
 	    ic->private.local.composed = p;
 	    /* return back to client KeyPressEvent keycode == 0 */
 	    ev->xkey.keycode = 0;
-	    _XPutBackEvent(d, ev);
+	    XPutBackEvent(d, ev);
 	    /* initialize internal state for next key sequence */
 	    ic->private.local.context = ((Xim)ic->core.im)->private.local.top;
 	    return(True);