Merge from origin/emacs-24

[gnu-emacs] / src / ChangeLog

diff --git a/src/ChangeLog b/src/ChangeLog
index 0a05b544d98326cb6386c62d39319ce2322d4436..2609ed7dd01cea7ee601ed00df25ea74dda24a7f 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,18 @@
+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
+       last character of a screen line is whitespace, and we are under
+       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)