Merge from origin/emacs-24

[gnu-emacs] / src / ChangeLog

diff --git a/src/ChangeLog b/src/ChangeLog
index 45946eb4a698755f4a8568f37292e5f64dc81289..422933d22f9d60ea08435403107972d87fbb0c84 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,13 @@
+2015-01-10  Eli Zaretskii  <eliz@gnu.org>
+
+       * indent.c (Fvertical_motion): Return zero if we started from ZV
+       and there's an overlay after-string there.  (Bug#19553)
+
+2015-01-09  Eli Zaretskii  <eliz@gnu.org>
+
+       * emacs.c (usage_message): Fix the description of the -nl switch.
+       (Bug#19542)
+
 2015-01-05  Eli Zaretskii  <eliz@gnu.org>
 
        * xdisp.c (move_it_to, try_cursor_movement): Don't use the window