*** keyboard.c.~1.986.~	2009-01-03 17:35:34.328125000 +0100
--- keyboard.c	2009-01-04 13:59:34.328125000 +0100
***************
*** 2548,2553 ****
--- 2548,2555 ----
  
    if (CONSP (Vunread_command_events))
      {
+       int was_disabled = 0;
+ 
        c = XCAR (Vunread_command_events);
        Vunread_command_events = XCDR (Vunread_command_events);
  
***************
*** 2568,2579 ****
        if (CONSP (c)
  	  && EQ (XCDR (c), Qdisabled)
  	  && (SYMBOLP (XCAR (c)) || INTEGERP (XCAR (c))))
! 	c = XCAR (c);
  
        /* If the queued event is something that used the mouse,
           set used_mouse_menu accordingly.  */
        if (used_mouse_menu
! 	  && (EQ (c, Qtool_bar) || EQ (c, Qmenu_bar)))
  	*used_mouse_menu = 1;
  
        goto reread_for_input_method;
--- 2570,2584 ----
        if (CONSP (c)
  	  && EQ (XCDR (c), Qdisabled)
  	  && (SYMBOLP (XCAR (c)) || INTEGERP (XCAR (c))))
! 	{
! 	  was_disabled = 1;
! 	  c = XCAR (c);
! 	}
  
        /* If the queued event is something that used the mouse,
           set used_mouse_menu accordingly.  */
        if (used_mouse_menu
! 	  && (EQ (c, Qtool_bar) || EQ (c, Qmenu_bar) || was_disabled))
  	*used_mouse_menu = 1;
  
        goto reread_for_input_method;