HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from mainline.
[bpt/emacs.git]
/
src
/
macros.h
diff --git
a/src/macros.h
b/src/macros.h
index
88f3487
..
32a97e4
100644
(file)
--- a/
src/macros.h
+++ b/
src/macros.h
@@
-1,13
+1,12
@@
/* Definitions for keyboard macro interpretation in GNU Emacs.
/* Definitions for keyboard macro interpretation in GNU Emacs.
- Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005,
- 2006, 2007 Free Software Foundation, Inc.
+ Copyright (C) 1985, 2001-2011 Free Software Foundation, Inc.
This file is part of GNU Emacs.
This file is part of GNU Emacs.
-GNU Emacs is free software
;
you can redistribute it and/or modify
+GNU Emacs is free software
:
you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
it under the terms of the GNU General Public License as published by
-the Free Software Foundation
; either version 3, or (at your option)
-any later version.
+the Free Software Foundation
, either version 3 of the License, or
+
(at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
GNU Emacs is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-15,19
+14,9
@@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
-along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA. */
+along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
-/* Kbd macro currently being executed (a string or vector). */
-
-extern Lisp_Object Vexecuting_kbd_macro;
-
-/* Index of next character to fetch from that macro. */
-
-extern EMACS_INT executing_kbd_macro_index;
-
/* Number of successful iterations so far
for innermost keyboard macro.
This is not bound at each level,
/* Number of successful iterations so far
for innermost keyboard macro.
This is not bound at each level,
@@
-43,16
+32,14
@@
extern Lisp_Object executing_kbd_macro;
/* Finish defining the current keyboard macro. */
/* Finish defining the current keyboard macro. */
-extern void end_kbd_macro
P_ ((void)
);
+extern void end_kbd_macro
(void
);
/* Declare that all chars stored so far in the kbd macro being defined
really belong to it. This is done in between editor commands. */
/* Declare that all chars stored so far in the kbd macro being defined
really belong to it. This is done in between editor commands. */
-extern void finalize_kbd_macro_chars
P_ ((void)
);
+extern void finalize_kbd_macro_chars
(void
);
/* Store a character into kbd macro being defined */
/* Store a character into kbd macro being defined */
-extern void store_kbd_macro_char
P_ ((Lisp_Object)
);
+extern void store_kbd_macro_char
(Lisp_Object
);
-/* arch-tag: 8edb7088-682f-4d1f-a4d9-0fbb7284234e
- (do not change this comment) */