Mercurial > emacs
diff src/macros.h @ 90159:08185296b491
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-44
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 272-288)
- src/xdisp.c (dump_glyph_row): Don't display overlay_arrow_p field.
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 67)
- Update from CVS
author | Miles Bader <miles@gnu.org> |
---|---|
date | Thu, 05 May 2005 00:04:55 +0000 |
parents | 68c22ea6027c 4f7e1a56469e |
children | f9a65d7ebd29 |
line wrap: on
line diff
--- a/src/macros.h Thu Apr 28 04:56:56 2005 +0000 +++ b/src/macros.h Thu May 05 00:04:55 2005 +0000 @@ -21,24 +21,24 @@ /* Kbd macro currently being executed (a string or vector). */ -extern Lisp_Object Vexecuting_macro; +extern Lisp_Object Vexecuting_kbd_macro; /* Index of next character to fetch from that macro. */ -extern EMACS_INT executing_macro_index; +extern EMACS_INT executing_kbd_macro_index; /* Number of successful iterations so far for innermost keyboard macro. This is not bound at each level, so after an error, it describes the innermost interrupted macro. */ -extern int executing_macro_iterations; +extern int executing_kbd_macro_iterations; /* This is the macro that was executing. This is not bound at each level, so after an error, it describes the innermost interrupted macro. */ -extern Lisp_Object executing_macro; +extern Lisp_Object executing_kbd_macro; /* Finish defining the current keyboard macro. */