aboutsummaryrefslogtreecommitdiffstats
path: root/src/macros.c
diff options
context:
space:
mode:
authorPaul Eggert2011-04-15 00:48:51 -0700
committerPaul Eggert2011-04-15 00:48:51 -0700
commit4170f62f39edf1ff1e99aec9bfbfe7bbf10e7fc9 (patch)
treee993b231bb5555c9c961f5d0b20d90ac76f77bbd /src/macros.c
parent1963a2e0bb07cc8dee6d27f972f93d9cfd7c6b2d (diff)
parent49093f601b69d91126aefd328ee8f6bfeb797407 (diff)
downloademacs-4170f62f39edf1ff1e99aec9bfbfe7bbf10e7fc9.tar.gz
emacs-4170f62f39edf1ff1e99aec9bfbfe7bbf10e7fc9.zip
Merge from mainline.
Diffstat (limited to 'src/macros.c')
-rw-r--r--src/macros.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/macros.c b/src/macros.c
index d90b31b503f..3523e513d6a 100644
--- a/src/macros.c
+++ b/src/macros.c
@@ -27,7 +27,8 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
27#include "window.h" 27#include "window.h"
28#include "keyboard.h" 28#include "keyboard.h"
29 29
30Lisp_Object Qexecute_kbd_macro, Qkbd_macro_termination_hook; 30Lisp_Object Qexecute_kbd_macro;
31static Lisp_Object Qkbd_macro_termination_hook;
31 32
32/* Number of successful iterations so far 33/* Number of successful iterations so far
33 for innermost keyboard macro. 34 for innermost keyboard macro.
@@ -391,4 +392,3 @@ This is nil when not executing a keyboard macro. */);
391 DEFVAR_KBOARD ("last-kbd-macro", Vlast_kbd_macro, 392 DEFVAR_KBOARD ("last-kbd-macro", Vlast_kbd_macro,
392 doc: /* Last kbd macro defined, as a string or vector; nil if none defined. */); 393 doc: /* Last kbd macro defined, as a string or vector; nil if none defined. */);
393} 394}
394