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

[Juanma Barranquero]

Index: emacs/src/macros.c
diff -c emacs/src/macros.c:1.50 emacs/src/macros.c:1.51
*** emacs/src/macros.c:1.50     Mon Sep  9 18:33:51 2002
--- emacs/src/macros.c  Tue Feb  4 09:03:12 2003
***************
*** 62,68 ****
  Use \\[name-last-kbd-macro] to give it a permanent name.
  Non-nil arg (prefix arg) means append to last macro defined;
  this begins by re-executing that macro as if you typed it again.
! If optional second arg, NO-EXEC, is non-nil, do not re-execute last 
  macro before appending to it. */)
       (append, no_exec)
       Lisp_Object append, no_exec;
--- 62,68 ----
  Use \\[name-last-kbd-macro] to give it a permanent name.
  Non-nil arg (prefix arg) means append to last macro defined;
  this begins by re-executing that macro as if you typed it again.
! If optional second arg, NO-EXEC, is non-nil, do not re-execute last
  macro before appending to it. */)
       (append, no_exec)
       Lisp_Object append, no_exec;
***************
*** 127,133 ****
        message ("Appending to kbd macro...");
      }
    current_kboard->defining_kbd_macro = Qt;
!   
    return Qnil;
  }
  
--- 127,133 ----
        message ("Appending to kbd macro...");
      }
    current_kboard->defining_kbd_macro = Qt;
! 
    return Qnil;
  }
  
***************
*** 155,161 ****
  counting the definition just completed as the first repetition.
  An argument of zero means repeat until error.
  
! In Lisp, optional second arg LOOPFUNC may be a function that is called prior 
to 
  each iteration of the macro.  Iteration stops if LOOPFUNC returns nil.  */)
       (repeat, loopfunc)
       Lisp_Object repeat, loopfunc;
--- 155,161 ----
  counting the definition just completed as the first repetition.
  An argument of zero means repeat until error.
  
! In Lisp, optional second arg LOOPFUNC may be a function that is called prior 
to
  each iteration of the macro.  Iteration stops if LOOPFUNC returns nil.  */)
       (repeat, loopfunc)
       Lisp_Object repeat, loopfunc;
***************
*** 198,204 ****
        if (kb->kbd_macro_ptr - kb->kbd_macro_buffer == kb->kbd_macro_bufsize)
        {
          int ptr_offset, end_offset, nbytes;
!         
          ptr_offset = kb->kbd_macro_ptr - kb->kbd_macro_buffer;
          end_offset = kb->kbd_macro_end - kb->kbd_macro_buffer;
          kb->kbd_macro_bufsize *= 2;
--- 198,204 ----
        if (kb->kbd_macro_ptr - kb->kbd_macro_buffer == kb->kbd_macro_bufsize)
        {
          int ptr_offset, end_offset, nbytes;
! 
          ptr_offset = kb->kbd_macro_ptr - kb->kbd_macro_buffer;
          end_offset = kb->kbd_macro_end - kb->kbd_macro_buffer;
          kb->kbd_macro_bufsize *= 2;
***************
*** 208,214 ****
          kb->kbd_macro_ptr = kb->kbd_macro_buffer + ptr_offset;
          kb->kbd_macro_end = kb->kbd_macro_buffer + end_offset;
        }
!       
        *kb->kbd_macro_ptr++ = c;
      }
  }
--- 208,214 ----
          kb->kbd_macro_ptr = kb->kbd_macro_buffer + ptr_offset;
          kb->kbd_macro_end = kb->kbd_macro_buffer + end_offset;
        }
! 
        *kb->kbd_macro_ptr++ = c;
      }
  }
***************
*** 248,256 ****
  A prefix argument serves as a repeat count.  Zero means repeat until error.
  
  To make a macro permanent so you can call it even after
! defining others, use \\[name-last-kbd-macro].  
  
! In Lisp, optional second arg LOOPFUNC may be a function that is called prior 
to 
  each iteration of the macro.  Iteration stops if LOOPFUNC returns nil.  */)
       (prefix, loopfunc)
       Lisp_Object prefix, loopfunc;
--- 248,256 ----
  A prefix argument serves as a repeat count.  Zero means repeat until error.
  
  To make a macro permanent so you can call it even after
! defining others, use \\[name-last-kbd-macro].
  
! In Lisp, optional second arg LOOPFUNC may be a function that is called prior 
to
  each iteration of the macro.  Iteration stops if LOOPFUNC returns nil.  */)
       (prefix, loopfunc)
       Lisp_Object prefix, loopfunc;
***************
*** 295,303 ****
  DEFUN ("execute-kbd-macro", Fexecute_kbd_macro, Sexecute_kbd_macro, 1, 3, 0,
         doc: /* Execute MACRO as string of editor command characters.
  If MACRO is a symbol, its function definition is used.
! COUNT is a repeat count, or nil for once, or 0 for infinite loop. 
  
! Optional third arg LOOPFUNC may be a function that is called prior to 
  each iteration of the macro.  Iteration stops if LOOPFUNC returns nil.  */)
       (macro, count, loopfunc)
       Lisp_Object macro, count, loopfunc;
--- 295,303 ----
  DEFUN ("execute-kbd-macro", Fexecute_kbd_macro, Sexecute_kbd_macro, 1, 3, 0,
         doc: /* Execute MACRO as string of editor command characters.
  If MACRO is a symbol, its function definition is used.
! COUNT is a repeat count, or nil for once, or 0 for infinite loop.
  
! Optional third arg LOOPFUNC may be a function that is called prior to
  each iteration of the macro.  Iteration stops if LOOPFUNC returns nil.  */)
       (macro, count, loopfunc)
       Lisp_Object macro, count, loopfunc;