diff options
| author | Glenn Morris | 2014-06-11 15:33:14 -0400 |
|---|---|---|
| committer | Glenn Morris | 2014-06-11 15:33:14 -0400 |
| commit | d29d249207dbb944ea93275ea8b8ea07f59c1e82 (patch) | |
| tree | ed19dc45de0f0822b038df22509ce111b2d5e4ac /src/ChangeLog | |
| parent | b765f1fe83a0df149ad783f7dae8ea01f71e680d (diff) | |
| parent | df907af0ddfc4282a6184f1b516cd92dbdf0093f (diff) | |
| download | emacs-d29d249207dbb944ea93275ea8b8ea07f59c1e82.tar.gz emacs-d29d249207dbb944ea93275ea8b8ea07f59c1e82.zip | |
Merge from emacs-24; up to 2014-06-02T14:17:07Z!michael.albinus@gmx.de
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 6733cf176ca..0e2af2d766e 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2014-06-11 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * xdisp.c (set_cursor_from_row): Fix an off-by-one error when | ||
| 4 | matching overlay strings with 'cursor' property against buffer | ||
| 5 | positions traversed in the glyph row. (Bug#17744) | ||
| 6 | |||
| 1 | 2014-06-11 Jan Djärv <jan.h.d@swipnet.se> | 7 | 2014-06-11 Jan Djärv <jan.h.d@swipnet.se> |
| 2 | 8 | ||
| 3 | * nsterm.h (EmacsApp): Always compile in shouldKeepRunning, isFirst | 9 | * nsterm.h (EmacsApp): Always compile in shouldKeepRunning, isFirst |