*** empty log message ***

diff --git a/src/rxvttoolkit.C b/src/rxvttoolkit.C
index ce1d761a3b3a62e21cc626b3f159afc4f9f8e96f..8f6b3b1c0b07c2ff1c77c82ed65d66305bc94d44 100644 (file)
--- a/src/rxvttoolkit.C
+++ b/src/rxvttoolkit.C
@@ -272,11 +272,14 @@ void rxvt_display::x_cb (io_watcher &w, short revents)
     }
   while (XEventsQueued (display, QueuedAlready));
 
-  flush ();
+  XFlush (display);
 }
 
 void rxvt_display::flush ()
 {
+  if (XEventsQueued (display, QueuedAlready))
+    x_cb (x_ev, EVENT_READ);
+
   XFlush (display);
 }
 
@@ -334,7 +337,9 @@ rxvt_xim *rxvt_display::get_xim (const char *locale, const char *modifiers)
 
 void rxvt_display::put_xim (rxvt_xim *xim)
 {
+#if XLIB_IS_RACEFREE
   xims.put (xim);
+#endif
 }
 #endif
 

diff --git a/src/version.h b/src/version.h
index 076690f1f3418360b5b8ef2f9e46f09a0edc8c00..0fa7ccac027134817037a15a2581d648a02b89fd 100644 (file)
--- a/src/version.h
+++ b/src/version.h
@@ -1,5 +1,5 @@
-#define VERSION "4.6"
-#define VSTRING "40600"
-#define DATE   "2004-12-16"
-#define LSMDATE        "16DEC04"
-#define LIBVERSION "4:6:0"
+#define VERSION "4.7"
+#define VSTRING "40700"
+#define DATE   "2004-12-29"
+#define LSMDATE        "29DEC04"
+#define LIBVERSION "4:7:0"