diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2015-12-20 17:27:28 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2015-12-20 17:27:54 -0800 |
| commit | 3864302c81d29c762c8ae31626bf22df69a8c99f (patch) | |
| tree | 350e8a63cde1c5ea3609757e0eba091b22f2faf7 | |
| parent | 4851616b4d2e14cdf970b9029f0d4b00083a08f5 (diff) | |
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.
| -rw-r--r-- | src/keyboard.c | 3 | ||||
| -rw-r--r-- | src/keyboard.h | 5 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/keyboard.c b/src/keyboard.c index 02bc7d2a0b..9ebd86b535 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -195,8 +195,9 @@ Lisp_Object unread_switch_frame; /* Last size recorded for a current buffer which is not a minibuffer. */ static ptrdiff_t last_non_minibuf_size; -/* Total number of times read_char has returned, modulo UINTMAX_MAX + 1. */ uintmax_t num_input_events; +ptrdiff_t point_before_last_command_or_undo; +struct buffer *buffer_before_last_command_or_undo; /* Value of num_nonmacro_input_events as of last auto save. */ diff --git a/src/keyboard.h b/src/keyboard.h index 6c715a44fb..890d24eb2d 100644 --- a/src/keyboard.h +++ b/src/keyboard.h @@ -245,16 +245,15 @@ extern KBOARD *current_kboard; /* Total number of times read_char has returned, modulo UINTMAX_MAX + 1. */ extern uintmax_t num_input_events; - /* The location of point immediately before the last command was executed, or the last time the undo-boundary command added a boundary.*/ -ptrdiff_t point_before_last_command_or_undo; +extern ptrdiff_t point_before_last_command_or_undo; /* The value of current_buffer immediately before the last command was executed, or the last time the undo-boundary command added a boundary.*/ -struct buffer *buffer_before_last_command_or_undo; +extern struct buffer *buffer_before_last_command_or_undo; extern struct buffer *prev_buffer; |