Show
Ignore:
Timestamp:
08/18/06 08:35:31 (2 years ago)
Author:
miyoshi
Message:

Sync up with Emacs CVS HEAD.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/src/keyboard.c

    r4140 r4148  
    110110/* File descriptor to use for input.  */ 
    111111extern int input_fd; 
     112 
     113/* Nonzero if we are executing from the SIGIO signal handler. */ 
     114int in_sighandler; 
    112115 
    113116#ifdef HAVE_WINDOW_SYSTEM 
    …… 
    26892692    } 
    26902693 
    2691   timer_start_idle (); 
     2694  /* Start idle timers if no time limit is supplied.  We don't do it 
     2695     if a time limit is supplied to avoid an infinite recursion in the 
     2696     situation where an idle timer calls `sit-for'.  */ 
     2697 
     2698  if (!end_time) 
     2699    timer_start_idle (); 
    26922700 
    26932701  /* If in middle of key sequence and minibuffer not active, 
    …… 
    27592767 
    27602768      /* Now that we have read an event, Emacs is not idle.  */ 
    2761       timer_stop_idle (); 
     2769      if (!end_time) 
     2770        timer_stop_idle (); 
    27622771 
    27632772      goto exit; 
    …… 
    28892898      save_getcjmp (save_jump); 
    28902899      restore_getcjmp (local_getcjmp); 
    2891       timer_start_idle (); 
     2900      if (!end_time) 
     2901        timer_start_idle (); 
    28922902      c = kbd_buffer_get_event (&kb, used_mouse_menu, end_time); 
    28932903      restore_getcjmp (save_jump); 
    …… 
    29412951 non_reread: 
    29422952 
    2943   timer_stop_idle (); 
     2953  if (!end_time) 
     2954    timer_stop_idle (); 
    29442955  RESUME_POLLING; 
    29452956 
    …… 
    29752986      Fcommand_execute (tem, Qnil, Fvector (1, &last_input_char), Qt); 
    29762987 
    2977       if (CONSP (c) && EQ (XCAR (c), Qselect_window)) 
     2988      if (CONSP (c) && EQ (XCAR (c), Qselect_window) && !end_time) 
    29782989        /* We stopped being idle for this event; undo that.  This 
    29792990           prevents automatic window selection (under 
    …… 
    31813192 
    31823193      /* We stopped being idle for this event; undo that.  */ 
    3183       timer_resume_idle (); 
     3194      if (!end_time) 
     3195        timer_resume_idle (); 
    31843196      goto retry; 
    31853197    } 
    …… 
    70677079#endif 
    70687080 
     7081  in_sighandler = 1; 
     7082 
    70697083  if (input_available_clear_time) 
    70707084    EMACS_SET_SECS_USECS (*input_available_clear_time, 0, 0); 
    …… 
    70787092#endif 
    70797093  errno = old_errno; 
     7094  in_sighandler = 0; 
    70807095} 
    70817096#endif /* SIGIO */ 
    …… 
    1098410999#endif 
    1098511000  input_pending = 0; 
     11001  in_sighandler = 0; 
    1098611002 
    1098711003  /* This means that command_loop_1 won't try to select anything the first