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

[Richard M . Stallman]

Index: emacs/src/macros.c
diff -c emacs/src/macros.c:1.55 emacs/src/macros.c:1.56
*** emacs/src/macros.c:1.55     Fri Nov  5 22:46:28 2004
--- emacs/src/macros.c  Sun May  1 18:48:26 2005
***************
*** 31,37 ****
  
  /* Kbd macro currently being executed (a string or vector).  */
  
! Lisp_Object Vexecuting_macro;
  
  /* Index of next character to fetch from that macro.  */
  
--- 31,37 ----
  
  /* Kbd macro currently being executed (a string or vector).  */
  
! Lisp_Object Vexecuting_kbd_macro;
  
  /* Index of next character to fetch from that macro.  */
  
***************
*** 285,291 ****
    return Qnil;
  }
  
! /* Restore Vexecuting_macro and executing_macro_index - called when
     the unwind-protect in Fexecute_kbd_macro gets invoked.  */
  
  static Lisp_Object
--- 285,291 ----
    return Qnil;
  }
  
! /* Restore Vexecuting_kbd_macro and executing_macro_index - called when
     the unwind-protect in Fexecute_kbd_macro gets invoked.  */
  
  static Lisp_Object
***************
*** 293,299 ****
       Lisp_Object info;
  {
    Lisp_Object tem;
!   Vexecuting_macro = XCAR (info);
    tem = XCDR (info);
    executing_macro_index = XINT (XCAR (tem));
    real_this_command = XCDR (tem);
--- 293,299 ----
       Lisp_Object info;
  {
    Lisp_Object tem;
!   Vexecuting_kbd_macro = XCAR (info);
    tem = XCDR (info);
    executing_macro_index = XINT (XCAR (tem));
    real_this_command = XCDR (tem);
***************
*** 330,336 ****
    if (!STRINGP (final) && !VECTORP (final))
      error ("Keyboard macros must be strings or vectors");
  
!   tem = Fcons (Vexecuting_macro,
               Fcons (make_number (executing_macro_index),
                      real_this_command));
    record_unwind_protect (pop_kbd_macro, tem);
--- 330,336 ----
    if (!STRINGP (final) && !VECTORP (final))
      error ("Keyboard macros must be strings or vectors");
  
!   tem = Fcons (Vexecuting_kbd_macro,
               Fcons (make_number (executing_macro_index),
                      real_this_command));
    record_unwind_protect (pop_kbd_macro, tem);
***************
*** 338,344 ****
    GCPRO2 (final, loopfunc);
    do
      {
!       Vexecuting_macro = final;
        executing_macro = final;
        executing_macro_index = 0;
  
--- 338,344 ----
    GCPRO2 (final, loopfunc);
    do
      {
!       Vexecuting_kbd_macro = final;
        executing_macro = final;
        executing_macro_index = 0;
  
***************
*** 359,369 ****
        QUIT;
      }
    while (--repeat
!        && (STRINGP (Vexecuting_macro) || VECTORP (Vexecuting_macro)));
  
    executing_macro = Qnil;
  
!   real_this_command = Vexecuting_macro;
  
    UNGCPRO;
    return unbind_to (pdlcount, Qnil);
--- 359,369 ----
        QUIT;
      }
    while (--repeat
!        && (STRINGP (Vexecuting_kbd_macro) || VECTORP (Vexecuting_kbd_macro)));
  
    executing_macro = Qnil;
  
!   real_this_command = Vexecuting_kbd_macro;
  
    UNGCPRO;
    return unbind_to (pdlcount, Qnil);
***************
*** 372,378 ****
  void
  init_macros ()
  {
!   Vexecuting_macro = Qnil;
    executing_macro = Qnil;
  }
  
--- 372,378 ----
  void
  init_macros ()
  {
!   Vexecuting_kbd_macro = Qnil;
    executing_macro = Qnil;
  }
  
***************
*** 396,410 ****
  The value is the symbol `append' while appending to the definition of
  an existing macro.  */);
  
!   DEFVAR_LISP ("executing-macro", &Vexecuting_macro,
!              doc: /* Currently executing keyboard macro (string or vector); 
nil if none executing.  */);
  
    DEFVAR_INT ("executing-macro-index", &executing_macro_index,
              doc: /* Index in currently executing keyboard macro; undefined if 
none executing.  */);
  
-   DEFVAR_LISP_NOPRO ("executing-kbd-macro", &Vexecuting_macro,
-                    doc: /* Currently executing keyboard macro (string or 
vector); nil if none executing.  */);
- 
    DEFVAR_KBOARD ("last-kbd-macro", Vlast_kbd_macro,
                 doc: /* Last kbd macro defined, as a string or vector; nil if 
none defined.  */);
  }
--- 396,408 ----
  The value is the symbol `append' while appending to the definition of
  an existing macro.  */);
  
!   DEFVAR_LISP ("executing-kbd-macro", &Vexecuting_kbd_macro,
!              doc: /* Currently executing keyboard macro (string or vector).
! This is nil when not executing a keyboard macro.  */);
  
    DEFVAR_INT ("executing-macro-index", &executing_macro_index,
              doc: /* Index in currently executing keyboard macro; undefined if 
none executing.  */);
  
    DEFVAR_KBOARD ("last-kbd-macro", Vlast_kbd_macro,
                 doc: /* Last kbd macro defined, as a string or vector; nil if 
none defined.  */);
  }