Merge from origin/emacs-24

[gnu-emacs] / src / ChangeLog

diff --git a/src/ChangeLog b/src/ChangeLog
index b1d9822f2f4063bd3d4d4864fe49a138051e52f5..8acca6cca3fc3cfadbad4009546cb920c82101c3 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -20,19 +20,16 @@
        * menu.c (Fx_popup_menu) [HAVE_X_WINDOWS]: Call
        mouse_position_for_popup only for X frames.  (Bug#19862)
 
-2015-03-03  Eli Zaretskii  <eliz@gnu.org>
 2015-03-03  Eli Zaretskii  <eliz@gnu.org>
 
        * buffer.c (syms_of_buffer): Doc fix.  (Bug#19841)
 
-2015-03-03  Eli Zaretskii  <eliz@gnu.org>
 2015-03-03  Eli Zaretskii  <eliz@gnu.org>
 
        * xfaces.c (map_tty_color): Use assoc_no_quit instead of
        assq_no_quit to fetch color definition by its string name.
        (Bug#19802)
 
-2015-03-03  Eli Zaretskii  <eliz@gnu.org>
 2015-03-03  Eli Zaretskii  <eliz@gnu.org>
 
        * xdisp.c (move_it_in_display_line_to): Handle the case where the
@@ -40,7 +37,6 @@
        word-wrap with overflow-newline-into-fringe turned on.
        (Bug#19769)
 
-2015-03-03  Eli Zaretskii  <eliz@gnu.org>
 2015-03-03  Eli Zaretskii  <eliz@gnu.org>
 
        * xdisp.c (handle_stop, handle_single_display_spec)