Merge from emacs-24; up to 2014-06-02T14:17:07Z!michael.albinus@gmx.de

[bpt/emacs.git] / src / ChangeLog

diff --git a/src/ChangeLog b/src/ChangeLog
index 6733cf1..0e2af2d 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2014-06-11  Eli Zaretskii  <eliz@gnu.org>
+
+       * xdisp.c (set_cursor_from_row): Fix an off-by-one error when
+       matching overlay strings with 'cursor' property against buffer
+       positions traversed in the glyph row.  (Bug#17744)
+
 2014-06-11  Jan Djärv  <jan.h.d@swipnet.se>
 
        * nsterm.h (EmacsApp): Always compile in shouldKeepRunning, isFirst