summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@suse.de>2014-07-29 10:08:04 +0200
committerAndreas Schwab <schwab@suse.de>2014-07-29 10:08:04 +0200
commitaac90c4a9c760ca12395783c7c4120427ba32a96 (patch)
tree9c7ba2aede41feb66bc7e080faeae50bcfe57e10
parent17ee955294f501c5da91d74baa8a8e38210d77eb (diff)
Fixes: debbugs:18140
* macros.c (Fstart_kbd_macro): Initialize kbd_macro_ptr and kbd_macro_end together with kbd_macro_buffer.
-rw-r--r--src/ChangeLog5
-rw-r--r--src/macros.c2
2 files changed, 7 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 090ed55bf9..a86b695e14 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2014-07-29 Andreas Schwab <schwab@suse.de>
+
+ * macros.c (Fstart_kbd_macro): Initialize kbd_macro_ptr and
+ kbd_macro_end together with kbd_macro_buffer. (Bug#18140)
+
2014-07-28 Eli Zaretskii <eliz@gnu.org>
* xdisp.c (display_line): If called with iterator set up to write
diff --git a/src/macros.c b/src/macros.c
index d0cf3c2c58..5bed625ff4 100644
--- a/src/macros.c
+++ b/src/macros.c
@@ -65,6 +65,8 @@ macro before appending to it. */)
{
current_kboard->kbd_macro_buffer = xmalloc (30 * word_size);
current_kboard->kbd_macro_bufsize = 30;
+ current_kboard->kbd_macro_ptr = current_kboard->kbd_macro_buffer;
+ current_kboard->kbd_macro_end = current_kboard->kbd_macro_buffer;
}
update_mode_lines = 19;
if (NILP (append))