diff options
| -rw-r--r-- | src/ChangeLog | 7 | ||||
| -rw-r--r-- | src/keyboard.c | 1 |
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 @@ +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 8c030c7652c..0d042132d8e 100644 --- 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; |