/[emacs]/emacs/src/keyboard.c
ViewVC logotype

Diff of /emacs/src/keyboard.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.653 by pj, Wed Feb 6 22:41:43 2002 UTC revision 1.654 by kfstorm, Wed Feb 6 22:59:56 2002 UTC
# Line 373  Lisp_Object Vthis_command; Line 373  Lisp_Object Vthis_command;
373  /* This is like Vthis_command, except that commands never set it.  */  /* This is like Vthis_command, except that commands never set it.  */
374  Lisp_Object real_this_command;  Lisp_Object real_this_command;
375    
376    /* If the lookup of the command returns a binding, the original
377       command is stored in this-original-command.  It is nil otherwise.  */
378    Lisp_Object Vthis_original_command;
379    
380  /* The value of point when the last command was executed.  */  /* The value of point when the last command was executed.  */
381  int last_point_position;  int last_point_position;
382    
# Line 1503  command_loop_1 () Line 1507  command_loop_1 ()
1507           reset it before we execute the command. */           reset it before we execute the command. */
1508        Vdeactivate_mark = Qnil;        Vdeactivate_mark = Qnil;
1509    
1510          /* Remap command through active keymaps */
1511          Vthis_original_command = cmd;
1512          if (is_command_symbol (cmd))
1513            {
1514              Lisp_Object cmd1;
1515    
1516              cmd1 = Fkey_binding (cmd, Qnil, Qt);
1517              if (!NILP (cmd1) && is_command_symbol (cmd1))
1518                cmd = cmd1;
1519            }
1520    
1521        /* Execute the command.  */        /* Execute the command.  */
1522    
1523        Vthis_command = cmd;        Vthis_command = cmd;
# Line 6947  parse_menu_item (item, notreal, inmenuba Line 6962  parse_menu_item (item, notreal, inmenuba
6962        Lisp_Object prefix;        Lisp_Object prefix;
6963    
6964        if (!NILP (tem))        if (!NILP (tem))
6965          tem = Fkey_binding (tem, Qnil);          tem = Fkey_binding (tem, Qnil, Qnil);
6966    
6967        prefix = AREF (item_properties, ITEM_PROPERTY_KEYEQ);        prefix = AREF (item_properties, ITEM_PROPERTY_KEYEQ);
6968        if (CONSP (prefix))        if (CONSP (prefix))
# Line 6993  parse_menu_item (item, notreal, inmenuba Line 7008  parse_menu_item (item, notreal, inmenuba
7008                && SYMBOLP (XSYMBOL (def)->function)                && SYMBOLP (XSYMBOL (def)->function)
7009                && ! NILP (Fget (def, Qmenu_alias)))                && ! NILP (Fget (def, Qmenu_alias)))
7010              def = XSYMBOL (def)->function;              def = XSYMBOL (def)->function;
7011            tem = Fwhere_is_internal (def, Qnil, Qt, Qnil);            tem = Fwhere_is_internal (def, Qnil, Qt, Qnil, Qt);
7012            XSETCAR (cachelist, tem);            XSETCAR (cachelist, tem);
7013            if (NILP (tem))            if (NILP (tem))
7014              {              {
# Line 9408  DEFUN ("execute-extended-command", Fexec Line 9423  DEFUN ("execute-extended-command", Fexec
9423        && NILP (Vexecuting_macro)        && NILP (Vexecuting_macro)
9424        && SYMBOLP (function))        && SYMBOLP (function))
9425      bindings = Fwhere_is_internal (function, Voverriding_local_map,      bindings = Fwhere_is_internal (function, Voverriding_local_map,
9426                                     Qt, Qnil);                                     Qt, Qnil, Qnil);
9427    else    else
9428      bindings = Qnil;      bindings = Qnil;
9429    
# Line 10635  The command can set this variable; whate Line 10650  The command can set this variable; whate
10650  will be in `last-command' during the following command.  */);  will be in `last-command' during the following command.  */);
10651    Vthis_command = Qnil;    Vthis_command = Qnil;
10652    
10653      DEFVAR_LISP ("this-original-command", &Vthis_original_command,
10654                   doc: /* If non-nil, the original command bound to the current key sequence.
10655    The value of `this-command' is the result of looking up the original
10656    command in the active keymaps.  */);
10657      Vthis_original_command = Qnil;
10658    
10659    DEFVAR_INT ("auto-save-interval", &auto_save_interval,    DEFVAR_INT ("auto-save-interval", &auto_save_interval,
10660                doc: /* *Number of input events between auto-saves.                doc: /* *Number of input events between auto-saves.
10661  Zero means disable autosaving due to number of characters typed.  */);  Zero means disable autosaving due to number of characters typed.  */);

Legend:
Removed from v.1.653  
changed lines
  Added in v.1.654

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26