diff options
| author | Stefan Monnier | 2012-03-25 16:37:21 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2012-03-25 16:37:21 -0400 |
| commit | 699c782b7668c44d0fa4446331b0590a6d5dac82 (patch) | |
| tree | 5dcce364741d0761920a3d274b0fc8aba4103d45 /src/macros.h | |
| parent | 98fb480ee31bf74cf554044f60f21df16566dd7f (diff) | |
| parent | e99a9b8bdccadded1f6fae88ee7a2a93dfd4eacf (diff) | |
| download | emacs-pending.tar.gz emacs-pending.zip | |
Merge from trunkpending
Diffstat (limited to 'src/macros.h')
| -rw-r--r-- | src/macros.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/macros.h b/src/macros.h index 32a97e457e8..d66784a0246 100644 --- a/src/macros.h +++ b/src/macros.h | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* Definitions for keyboard macro interpretation in GNU Emacs. | 1 | /* Definitions for keyboard macro interpretation in GNU Emacs. |
| 2 | Copyright (C) 1985, 2001-2011 Free Software Foundation, Inc. | 2 | Copyright (C) 1985, 2001-2012 Free Software Foundation, Inc. |
| 3 | 3 | ||
| 4 | This file is part of GNU Emacs. | 4 | This file is part of GNU Emacs. |
| 5 | 5 | ||
| @@ -22,7 +22,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 22 | This is not bound at each level, | 22 | This is not bound at each level, |
| 23 | so after an error, it describes the innermost interrupted macro. */ | 23 | so after an error, it describes the innermost interrupted macro. */ |
| 24 | 24 | ||
| 25 | extern int executing_kbd_macro_iterations; | 25 | extern EMACS_INT executing_kbd_macro_iterations; |
| 26 | 26 | ||
| 27 | /* This is the macro that was executing. | 27 | /* This is the macro that was executing. |
| 28 | This is not bound at each level, | 28 | This is not bound at each level, |
| @@ -42,4 +42,3 @@ extern void finalize_kbd_macro_chars (void); | |||
| 42 | /* Store a character into kbd macro being defined */ | 42 | /* Store a character into kbd macro being defined */ |
| 43 | 43 | ||
| 44 | extern void store_kbd_macro_char (Lisp_Object); | 44 | extern void store_kbd_macro_char (Lisp_Object); |
| 45 | |||