From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 21 Dec 2015 01:27:28 +0000 (-0800)
Subject: Port undo fixes to -fno-common
X-Git-Tag: emacs-25.0.90~423
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3864302c81d29c762c8ae31626bf22df69a8c99f;p=emacs.git

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.
---

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;
 /* 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 6c715a44fba..890d24eb2d9 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;