repo: rxvt-unicode-sixel
action: commit
revision: 
path_from: 
revision_from: 421791aec62838347568f7540496f48fe4f79fc3:
path_to: 
revision_to: 

commit 421791aec62838347568f7540496f48fe4f79fc3
Author: Marc Lehmann 
Date:   Wed Dec 29 19:59:46 2004 +0000

    *** empty log message ***

diff --git a/src/rxvttoolkit.C b/src/rxvttoolkit.C

--- 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

--- 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"

-----END OF PAGE-----