[Emacs-diffs] Changes to emacs/src/keyboard.c

[Nick Roberts]

Index: emacs/src/keyboard.c
diff -c emacs/src/keyboard.c:1.824 emacs/src/keyboard.c:1.825
*** emacs/src/keyboard.c:1.824  Mon May 16 21:25:32 2005
--- emacs/src/keyboard.c        Wed May 18 23:19:56 2005
***************
*** 450,460 ****
  Lisp_Object Qpre_command_hook, Vpre_command_hook;
  Lisp_Object Qpost_command_hook, Vpost_command_hook;
  Lisp_Object Qcommand_hook_internal, Vcommand_hook_internal;
- /* Hook run after a command if there's no more input soon.  */
- Lisp_Object Qpost_command_idle_hook, Vpost_command_idle_hook;
- 
- /* Delay time in microseconds before running post-command-idle-hook.  */
- EMACS_INT post_command_idle_delay;
  
  /* List of deferred actions to be performed at a later time.
     The precise format isn't relevant here; we just check whether it is nil.  
*/
--- 450,455 ----
***************
*** 1447,1462 ****
  
        if (!NILP (Vdeferred_action_list))
        safe_run_hooks (Qdeferred_action_function);
- 
-       if (!NILP (Vpost_command_idle_hook) && !NILP (Vrun_hooks))
-       {
-         if (NILP (Vunread_command_events)
-             && NILP (Vunread_input_method_events)
-             && NILP (Vunread_post_input_method_events)
-             && NILP (Vexecuting_kbd_macro)
-             && !NILP (sit_for (0, post_command_idle_delay, 0, 1, 1)))
-           safe_run_hooks (Qpost_command_idle_hook);
-       }
      }
  
    Vmemory_full = Qnil;
--- 1442,1447 ----
***************
*** 1822,1837 ****
        if (!NILP (Vdeferred_action_list))
        safe_run_hooks (Qdeferred_action_function);
  
-       if (!NILP (Vpost_command_idle_hook) && !NILP (Vrun_hooks))
-       {
-         if (NILP (Vunread_command_events)
-             && NILP (Vunread_input_method_events)
-             && NILP (Vunread_post_input_method_events)
-             && NILP (Vexecuting_kbd_macro)
-             && !NILP (sit_for (0, post_command_idle_delay, 0, 1, 1)))
-           safe_run_hooks (Qpost_command_idle_hook);
-       }
- 
        /* If there is a prefix argument,
         1) We don't want Vlast_command to be ``universal-argument''
         (that would be dumb), so don't set Vlast_command,
--- 1807,1812 ----
***************
*** 10855,10863 ****
    Qpost_command_hook = intern ("post-command-hook");
    staticpro (&Qpost_command_hook);
  
-   Qpost_command_idle_hook = intern ("post-command-idle-hook");
-   staticpro (&Qpost_command_idle_hook);
- 
    Qdeferred_action_function = intern ("deferred-action-function");
    staticpro (&Qdeferred_action_function);
  
--- 10830,10835 ----
***************
*** 11303,11318 ****
  might happen repeatedly and make Emacs nonfunctional.  */);
    Vpost_command_hook = Qnil;
  
-   DEFVAR_LISP ("post-command-idle-hook", &Vpost_command_idle_hook,
-              doc: /* Normal hook run after each command is executed, if idle.
- Errors running the hook are caught and ignored.  */);
-   Vpost_command_idle_hook = Qnil;
- 
-   DEFVAR_INT ("post-command-idle-delay", &post_command_idle_delay,
-             doc: /* Delay time before running `post-command-idle-hook'.
- This is measured in microseconds.  */);
-   post_command_idle_delay = 100000;
- 
  #if 0
    DEFVAR_LISP ("echo-area-clear-hook", ...,
               doc: /* Normal hook run when clearing the echo area.  */);
--- 11275,11280 ----