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

[Miles Bader]

Index: emacs/src/keyboard.c
diff -c emacs/src/keyboard.c:1.753.2.9 emacs/src/keyboard.c:1.753.2.10
*** emacs/src/keyboard.c:1.753.2.9      Tue Aug  3 00:03:00 2004
--- emacs/src/keyboard.c        Tue Aug 10 07:46:40 2004
***************
*** 131,138 ****
  #endif
  
  /* Non-nil disable property on a command means
!    do not execute it; call disabled-command-hook's value instead.  */
! Lisp_Object Qdisabled, Qdisabled_command_hook;
  
  #define NUM_RECENT_KEYS (100)
  int recent_keys_index;        /* Index for storing next element into 
recent_keys */
--- 131,138 ----
  #endif
  
  /* Non-nil disable property on a command means
!    do not execute it; call disabled-command-function's value instead.  */
! Lisp_Object Qdisabled, Qdisabled_command_function;
  
  #define NUM_RECENT_KEYS (100)
  int recent_keys_index;        /* Index for storing next element into 
recent_keys */
***************
*** 9663,9671 ****
        tem = Fget (cmd, Qdisabled);
        if (!NILP (tem) && !NILP (Vrun_hooks))
        {
!         tem = Fsymbol_value (Qdisabled_command_hook);
          if (!NILP (tem))
!           return call1 (Vrun_hooks, Qdisabled_command_hook);
        }
      }
  
--- 9663,9671 ----
        tem = Fget (cmd, Qdisabled);
        if (!NILP (tem) && !NILP (Vrun_hooks))
        {
!         tem = Fsymbol_value (Qdisabled_command_function);
          if (!NILP (tem))
!           return call1 (Vrun_hooks, Qdisabled_command_function);
        }
      }
  
***************
*** 10780,10787 ****
    Qtimer_event_handler = intern ("timer-event-handler");
    staticpro (&Qtimer_event_handler);
  
!   Qdisabled_command_hook = intern ("disabled-command-hook");
!   staticpro (&Qdisabled_command_hook);
  
    Qself_insert_command = intern ("self-insert-command");
    staticpro (&Qself_insert_command);
--- 10780,10787 ----
    Qtimer_event_handler = intern ("timer-event-handler");
    staticpro (&Qtimer_event_handler);
  
!   Qdisabled_command_function = intern ("disabled-command-function");
!   staticpro (&Qdisabled_command_function);
  
    Qself_insert_command = intern ("self-insert-command");
    staticpro (&Qself_insert_command);
***************
*** 11278,11283 ****
--- 11278,11284 ----
                 doc: /* Per-terminal keymap that overrides all other local 
keymaps.
  If this variable is non-nil, it is used as a keymap instead of the
  buffer's local map, and the minor mode keymaps and text property keymaps.
+ It also overrides `overriding-local-map'.
  This variable is intended to let commands such as `universal-argument'
  set up a different keymap for reading the next command.  */);