--- a/src/event-stream.c	Mon Aug 13 10:32:23 2007 +0200
+++ b/src/event-stream.c	Mon Aug 13 10:33:18 2007 +0200
@@ -557,15 +557,15 @@
      Let's hope it doesn't.  I think the code here is fairly
      clean and doesn't do this. */
   emacs_is_blocking = 1;
-
-  /* Do not poll for quit while blocking, because this prevents idle
-     XEmacs from swapping out from memory */
+#if 0
+  /* Do this if the poll-for-quit timer seems to be taking too
+     much CPU time when idle ... */
   reset_poll_for_quit ();
-
+#endif
   event_stream->next_event_cb (event);
-
+#if 0
   init_poll_for_quit ();
-
+#endif
   emacs_is_blocking = 0;
 
 #ifdef DEBUG_XEMACS
@@ -1609,8 +1609,12 @@
 
   XEVENT (event)->event_type = misc_user_event;
   XEVENT (event)->channel = channel;
-  XEVENT (event)->event.eval.function = function;
-  XEVENT (event)->event.eval.object = object;
+  XEVENT (event)->event.misc.function  = function;
+  XEVENT (event)->event.misc.object    = object;
+  XEVENT (event)->event.misc.button    = 0;
+  XEVENT (event)->event.misc.modifiers = 0;
+  XEVENT (event)->event.misc.x         = -1;
+  XEVENT (event)->event.misc.y         = -1;
   enqueue_command_event (event);
 
   return event;
@@ -2239,9 +2243,6 @@
     default:
       goto RETURN;
     case button_release_event:
-#if defined(HAVE_OFFIX_DND) || defined(HAVE_MS_WINDOWS)
-    case dnd_drop_event:
-#endif
     case misc_user_event:
       /* don't echo menu accelerator keys */
       reset_key_echo (command_builder, 1);
@@ -4033,9 +4034,6 @@
       if (EVENTP (event)
 	  && (XEVENT_TYPE (event) == button_press_event
 	      || XEVENT_TYPE (event) == button_release_event
-#if defined(HAVE_OFFIX_DND) || defined(HAVE_MS_WINDOWS)
-	      || XEVENT_TYPE (event) == dnd_drop_event
-#endif
 	      || XEVENT_TYPE (event) == misc_user_event))
 	{
 	  if (!n)
@@ -4067,9 +4065,6 @@
 	  {
 	  case button_press_event :
 	  case button_release_event :
-#if defined(HAVE_OFFIX_DND) || defined(HAVE_MS_WINDOWS)
-	  case dnd_drop_event:
-#endif
 	  case misc_user_event :
 	    if (n == 0)
 	      return event;
@@ -4173,10 +4168,6 @@
 	else if (e->event_type == button_press_event
 		 || e->event_type == button_release_event)
 	  e->event.button.modifiers |= MOD_META;
-#if defined(HAVE_OFFIX_DND) || defined(HAVE_MS_WINDOWS)
-	else if (e->event_type == dnd_drop_event)
-	  e->event.dnd_drop.modifiers |= MOD_META;
-#endif
 	else
 	  abort ();
 
@@ -4276,9 +4267,6 @@
       break;
     case button_press_event:
     case button_release_event:
-#if defined(HAVE_OFFIX_DND) || defined(HAVE_MS_WINDOWS)
-    case dnd_drop_event:
-#endif
     case misc_user_event:
       Vcurrent_mouse_event = Fcopy_event (event, Qnil);
       break;
@@ -4506,9 +4494,6 @@
     {
     case button_press_event:
     case button_release_event:
-#if defined(HAVE_OFFIX_DND) || defined(HAVE_MS_WINDOWS)
-    case dnd_drop_event:
-#endif
     case key_press_event:
       {
 	Lisp_Object leaf = lookup_command_event (command_builder, event, 1);