* keyboard.c (Qleft, Qright): Remove duplicate definitions.

These were already defined in buffer.c, and the duplicate
definitions cause problems on platforms like 'gcc -fno-common'.
Reported by Peter Dyballa in: http://bugs.gnu.org/9927#137

diff --git a/src/ChangeLog b/src/ChangeLog
index 0b58cdc1662fdd49d6f112416f44a9e7a4ab86f6..facddf3b84901dbb7b2f187279473c6b3f84416e 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2014-10-05  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * keyboard.c (Qleft, Qright): Remove duplicate definitions (Bug#9927).
+       These were already defined in buffer.c, and the duplicate
+       definitions cause problems on platforms like 'gcc -fno-common'.
+       Reported by Peter Dyballa in: http://bugs.gnu.org/9927#137
+
 2014-10-05  Jan Djärv  <jan.h.d@swipnet.se>
 
        * nsterm.m (updateFrameSize:): Only call update_frame_tool_bar

diff --git a/src/keyboard.c b/src/keyboard.c
index 8c030c7652c3a66c6c00c3bc1646f1a3c055745b..0d042132d8ed2d324e05b55e94bfa18d60a38625 100644 (file)
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -5217,7 +5217,6 @@ static const char *const lispy_drag_n_drop_names[] =
 static Lisp_Object Qabove_handle, Qhandle, Qbelow_handle;
 static Lisp_Object Qbefore_handle, Qhorizontal_handle, Qafter_handle;
 Lisp_Object Qup, Qdown, Qtop, Qbottom;
-Lisp_Object Qleft, Qright;
 static Lisp_Object Qleftmost, Qrightmost;
 static Lisp_Object Qend_scroll;
 static Lisp_Object Qratio;