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

[Kim F . Storm]

Index: emacs/src/keyboard.c
diff -c emacs/src/keyboard.c:1.821 emacs/src/keyboard.c:1.822
*** emacs/src/keyboard.c:1.821  Sun May  1 18:47:16 2005
--- emacs/src/keyboard.c        Mon May  2 10:32:40 2005
***************
*** 1173,1185 ****
      cancel_hourglass ();
  #endif
  
!   if (!NILP (executing_macro))
      {
!       if (executing_macro_iterations == 1)
        sprintf (macroerror, "After 1 kbd macro iteration: ");
        else
        sprintf (macroerror, "After %d kbd macro iterations: ",
!                executing_macro_iterations);
      }
    else
      *macroerror = 0;
--- 1173,1185 ----
      cancel_hourglass ();
  #endif
  
!   if (!NILP (executing_kbd_macro))
      {
!       if (executing_kbd_macro_iterations == 1)
        sprintf (macroerror, "After 1 kbd macro iteration: ");
        else
        sprintf (macroerror, "After %d kbd macro iterations: ",
!                executing_kbd_macro_iterations);
      }
    else
      *macroerror = 0;
***************
*** 1187,1193 ****
    Vstandard_output = Qt;
    Vstandard_input = Qt;
    Vexecuting_kbd_macro = Qnil;
!   executing_macro = Qnil;
    current_kboard->Vprefix_arg = Qnil;
    current_kboard->Vlast_prefix_arg = Qnil;
    cancel_echoing ();
--- 1187,1193 ----
    Vstandard_output = Qt;
    Vstandard_input = Qt;
    Vexecuting_kbd_macro = Qnil;
!   executing_kbd_macro = Qnil;
    current_kboard->Vprefix_arg = Qnil;
    current_kboard->Vlast_prefix_arg = Qnil;
    cancel_echoing ();
***************
*** 1288,1294 ****
      {
        Lisp_Object val;
        val = internal_catch (Qexit, command_loop_2, Qnil);
!       executing_macro = Qnil;
        return val;
      }
    else
--- 1288,1294 ----
      {
        Lisp_Object val;
        val = internal_catch (Qexit, command_loop_2, Qnil);
!       executing_kbd_macro = Qnil;
        return val;
      }
    else
***************
*** 1300,1306 ****
           other reason.  */
        any_kboard_state ();
        internal_catch (Qtop_level, command_loop_2, Qnil);
!       executing_macro = Qnil;
  
        /* End of file in -batch run causes exit here.  */
        if (noninteractive)
--- 1300,1306 ----
           other reason.  */
        any_kboard_state ();
        internal_catch (Qtop_level, command_loop_2, Qnil);
!       executing_kbd_macro = Qnil;
  
        /* End of file in -batch run causes exit here.  */
        if (noninteractive)
***************
*** 2517,2534 ****
         Also, some things replace the macro with t
         to force an early exit.  */
        if (EQ (Vexecuting_kbd_macro, Qt)
!         || executing_macro_index >= XFASTINT (Flength (Vexecuting_kbd_macro)))
        {
          XSETINT (c, -1);
          goto exit;
        }
  
!       c = Faref (Vexecuting_kbd_macro, make_number (executing_macro_index));
        if (STRINGP (Vexecuting_kbd_macro)
          && (XINT (c) & 0x80) && (XUINT (c) <= 0xff))
        XSETFASTINT (c, CHAR_META | (XINT (c) & ~0x80));
  
!       executing_macro_index++;
  
        goto from_macro;
      }
--- 2517,2534 ----
         Also, some things replace the macro with t
         to force an early exit.  */
        if (EQ (Vexecuting_kbd_macro, Qt)
!         || executing_kbd_macro_index >= XFASTINT (Flength 
(Vexecuting_kbd_macro)))
        {
          XSETINT (c, -1);
          goto exit;
        }
  
!       c = Faref (Vexecuting_kbd_macro, make_number 
(executing_kbd_macro_index));
        if (STRINGP (Vexecuting_kbd_macro)
          && (XINT (c) & 0x80) && (XUINT (c) <= 0xff))
        XSETFASTINT (c, CHAR_META | (XINT (c) & ~0x80));
  
!       executing_kbd_macro_index++;
  
        goto from_macro;
      }