aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2015-12-20 17:27:28 -0800
committerPaul Eggert2015-12-20 17:27:54 -0800
commit3864302c81d29c762c8ae31626bf22df69a8c99f (patch)
tree350e8a63cde1c5ea3609757e0eba091b22f2faf7 /src
parent4851616b4d2e14cdf970b9029f0d4b00083a08f5 (diff)
downloademacs-3864302c81d29c762c8ae31626bf22df69a8c99f.tar.gz
emacs-3864302c81d29c762c8ae31626bf22df69a8c99f.zip
Port undo fixes to -fno-common
Port recent fix for Bug#21968 to platforms like 'gcc -fno-common'. * src/keyboard.c, src/keyboard.h (point_before_last_command_or_undo) (buffer_before_last_command_or_undo): Declare in keyboard.h, and define in keyboard.c, instead of assuming the traditional Unix relaxed ref-def linkage.
Diffstat (limited to 'src')
-rw-r--r--src/keyboard.c3
-rw-r--r--src/keyboard.h5
2 files changed, 4 insertions, 4 deletions
diff --git a/src/keyboard.c b/src/keyboard.c
index 02bc7d2a0b7..9ebd86b5356 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -195,8 +195,9 @@ Lisp_Object unread_switch_frame;
195/* Last size recorded for a current buffer which is not a minibuffer. */ 195/* Last size recorded for a current buffer which is not a minibuffer. */
196static ptrdiff_t last_non_minibuf_size; 196static ptrdiff_t last_non_minibuf_size;
197 197
198/* Total number of times read_char has returned, modulo UINTMAX_MAX + 1. */
199uintmax_t num_input_events; 198uintmax_t num_input_events;
199ptrdiff_t point_before_last_command_or_undo;
200struct buffer *buffer_before_last_command_or_undo;
200 201
201/* Value of num_nonmacro_input_events as of last auto save. */ 202/* Value of num_nonmacro_input_events as of last auto save. */
202 203
diff --git a/src/keyboard.h b/src/keyboard.h
index 6c715a44fba..890d24eb2d9 100644
--- a/src/keyboard.h
+++ b/src/keyboard.h
@@ -245,16 +245,15 @@ extern KBOARD *current_kboard;
245/* Total number of times read_char has returned, modulo UINTMAX_MAX + 1. */ 245/* Total number of times read_char has returned, modulo UINTMAX_MAX + 1. */
246extern uintmax_t num_input_events; 246extern uintmax_t num_input_events;
247 247
248
249/* The location of point immediately before the last command was 248/* The location of point immediately before the last command was
250 executed, or the last time the undo-boundary command added a 249 executed, or the last time the undo-boundary command added a
251 boundary.*/ 250 boundary.*/
252ptrdiff_t point_before_last_command_or_undo; 251extern ptrdiff_t point_before_last_command_or_undo;
253 252
254/* The value of current_buffer immediately before the last command was 253/* The value of current_buffer immediately before the last command was
255 executed, or the last time the undo-boundary command added a 254 executed, or the last time the undo-boundary command added a
256 boundary.*/ 255 boundary.*/
257struct buffer *buffer_before_last_command_or_undo; 256extern struct buffer *buffer_before_last_command_or_undo;
258 257
259extern struct buffer *prev_buffer; 258extern struct buffer *prev_buffer;
260 259