aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2011-01-19 22:10:05 -0800
committerGlenn Morris2011-01-19 22:10:05 -0800
commitbb1c6663330a318d86e64bf6ec87baf69d486958 (patch)
treebc06a3733763d87e01d6c493eae51b8ef10b6b26
parent130e4a5d84e273dd730f1d25984f6d9a9707bd00 (diff)
downloademacs-bb1c6663330a318d86e64bf6ec87baf69d486958.tar.gz
emacs-bb1c6663330a318d86e64bf6ec87baf69d486958.zip
Give kbd-macro-termination-hook a doc.
* src/macros.c (syms_of_macros) <kbd-macro-termination-hook>: Give it a doc string. * src/globals.h: Add Vkbd_macro_termination_hook.
-rw-r--r--src/ChangeLog6
-rw-r--r--src/globals.h5
-rw-r--r--src/macros.c10
3 files changed, 19 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 7227d2e9940..6e54c7a1809 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
12011-01-20 Glenn Morris <rgm@gnu.org>
2
3 * macros.c (syms_of_macros) <kbd-macro-termination-hook>:
4 Give it a doc string.
5 * globals.h: Add Vkbd_macro_termination_hook.
6
12011-01-20 Chong Yidong <cyd@stupidchicken.com> 72011-01-20 Chong Yidong <cyd@stupidchicken.com>
2 8
3 * fns.c (Fyes_or_no_p): Revert 2011-01-07 change, removing ARGS. 9 * fns.c (Fyes_or_no_p): Revert 2011-01-07 change, removing ARGS.
diff --git a/src/globals.h b/src/globals.h
index 8f4749054e9..2b051dd542c 100644
--- a/src/globals.h
+++ b/src/globals.h
@@ -937,6 +937,9 @@ struct emacs_globals
937 937
938 Lisp_Object f_Vobarray; 938 Lisp_Object f_Vobarray;
939 939
940 /* Normal hook run whenever a keyboard macro terminates. */
941 Lisp_Object f_Vkbd_macro_termination_hook;
942
940 /* Kbd macro currently being executed (a string or vector). */ 943 /* Kbd macro currently being executed (a string or vector). */
941 Lisp_Object f_Vexecuting_kbd_macro; 944 Lisp_Object f_Vexecuting_kbd_macro;
942 945
@@ -1951,6 +1954,8 @@ extern struct emacs_globals globals;
1951 globals.f_Vexec_path 1954 globals.f_Vexec_path
1952#define Vexec_suffixes \ 1955#define Vexec_suffixes \
1953 globals.f_Vexec_suffixes 1956 globals.f_Vexec_suffixes
1957#define Vkbd_macro_termination_hook \
1958 globals.f_Vkbd_macro_termination_hook
1954#define Vexecuting_kbd_macro \ 1959#define Vexecuting_kbd_macro \
1955 globals.f_Vexecuting_kbd_macro 1960 globals.f_Vexecuting_kbd_macro
1956#define Vface_default_stipple \ 1961#define Vface_default_stipple \
diff --git a/src/macros.c b/src/macros.c
index 35ff5552466..62400bc3ea0 100644
--- a/src/macros.c
+++ b/src/macros.c
@@ -1,6 +1,7 @@
1/* Keyboard macros. 1/* Keyboard macros.
2 Copyright (C) 1985, 1986, 1993, 2000, 2001, 2002, 2003, 2004, 2
3 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. 3Copyright (C) 1985, 1986, 1993, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
4 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
4 5
5This file is part of GNU Emacs. 6This file is part of GNU Emacs.
6 7
@@ -361,6 +362,11 @@ syms_of_macros (void)
361{ 362{
362 Qexecute_kbd_macro = intern_c_string ("execute-kbd-macro"); 363 Qexecute_kbd_macro = intern_c_string ("execute-kbd-macro");
363 staticpro (&Qexecute_kbd_macro); 364 staticpro (&Qexecute_kbd_macro);
365
366 DEFVAR_LISP ("kbd-macro-termination-hook", Vkbd_macro_termination_hook,
367 doc: /* Normal hook run whenever a keyboard macro terminates.
368This is run whether the macro ends normally or prematurely due to an error. */);
369 Vkbd_macro_termination_hook = Qnil;
364 Qkbd_macro_termination_hook = intern_c_string ("kbd-macro-termination-hook"); 370 Qkbd_macro_termination_hook = intern_c_string ("kbd-macro-termination-hook");
365 staticpro (&Qkbd_macro_termination_hook); 371 staticpro (&Qkbd_macro_termination_hook);
366 372