aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2014-10-05 16:18:31 -0700
committerPaul Eggert2014-10-05 16:18:31 -0700
commit918b5def3f68a99dfd6474afa20c56ab0df3fd09 (patch)
treec050f4920754069f4de54b203717841214f633da
parentd589d252238f18a1eeea0db545ebf43e3eaaa42f (diff)
downloademacs-918b5def3f68a99dfd6474afa20c56ab0df3fd09.tar.gz
emacs-918b5def3f68a99dfd6474afa20c56ab0df3fd09.zip
* 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
-rw-r--r--src/ChangeLog7
-rw-r--r--src/keyboard.c1
2 files changed, 7 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 0b58cdc1662..facddf3b849 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
12014-10-05 Paul Eggert <eggert@cs.ucla.edu>
2
3 * keyboard.c (Qleft, Qright): Remove duplicate definitions (Bug#9927).
4 These were already defined in buffer.c, and the duplicate
5 definitions cause problems on platforms like 'gcc -fno-common'.
6 Reported by Peter Dyballa in: http://bugs.gnu.org/9927#137
7
12014-10-05 Jan Djärv <jan.h.d@swipnet.se> 82014-10-05 Jan Djärv <jan.h.d@swipnet.se>
2 9
3 * nsterm.m (updateFrameSize:): Only call update_frame_tool_bar 10 * nsterm.m (updateFrameSize:): Only call update_frame_tool_bar
diff --git a/src/keyboard.c b/src/keyboard.c
index 8c030c7652c..0d042132d8e 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -5217,7 +5217,6 @@ static const char *const lispy_drag_n_drop_names[] =
5217static Lisp_Object Qabove_handle, Qhandle, Qbelow_handle; 5217static Lisp_Object Qabove_handle, Qhandle, Qbelow_handle;
5218static Lisp_Object Qbefore_handle, Qhorizontal_handle, Qafter_handle; 5218static Lisp_Object Qbefore_handle, Qhorizontal_handle, Qafter_handle;
5219Lisp_Object Qup, Qdown, Qtop, Qbottom; 5219Lisp_Object Qup, Qdown, Qtop, Qbottom;
5220Lisp_Object Qleft, Qright;
5221static Lisp_Object Qleftmost, Qrightmost; 5220static Lisp_Object Qleftmost, Qrightmost;
5222static Lisp_Object Qend_scroll; 5221static Lisp_Object Qend_scroll;
5223static Lisp_Object Qratio; 5222static Lisp_Object Qratio;