diff options
| author | Glenn Morris | 2014-08-27 18:59:29 -0700 |
|---|---|---|
| committer | Glenn Morris | 2014-08-27 18:59:29 -0700 |
| commit | 6d26235315194737c4dc8653cf6d05177a10fa9c (patch) | |
| tree | 4a80f49f2073d80610931dd8706e90527a98340b /src/ChangeLog | |
| parent | 93b31b57283d369fefc5c95082d7b09288f05128 (diff) | |
| parent | b62da77c1c94b393f8be7854ff1cb30b012aa238 (diff) | |
| download | emacs-6d26235315194737c4dc8653cf6d05177a10fa9c.tar.gz emacs-6d26235315194737c4dc8653cf6d05177a10fa9c.zip | |
Merge from emacs-24; up to 2014-07-02T00:57:53Z!juri@jurta.org
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index e79cef6a8a4..d08b3780242 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,20 @@ | |||
| 1 | 2014-08-28 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * conf_post.h (_GL_EXECINFO_INLINE) [MSDOS]: Don't define. | ||
| 4 | |||
| 5 | * indent.c (Fvertical_motion): Fix vertical motion up through a | ||
| 6 | display property after a newline. (Bug#18276) | ||
| 7 | |||
| 8 | * xdisp.c (display_line): Don't assume that the call to | ||
| 9 | reseat_at_next_visible_line_start ends up at a character | ||
| 10 | immediately following the newline on the previous line. Avoids | ||
| 11 | setting the ends_at_zv_p flag on screen lines that are not at or | ||
| 12 | beyond ZV, which causes infloop in redisplay. For the details, see | ||
| 13 | http://lists.gnu.org/archive/html/emacs-devel/2014-08/msg00368.html. | ||
| 14 | |||
| 15 | * dispnew.c (buffer_posn_from_coords): Fix mirroring of X | ||
| 16 | coordinate for hscrolled R2L screen lines. (Bug#18277) | ||
| 17 | |||
| 1 | 2014-08-28 Paul Eggert <eggert@cs.ucla.edu> | 18 | 2014-08-28 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 19 | ||
| 3 | * sysdep.c (LC_COLLATE, LC_COLLATE_MASK): Give individual defaults | 20 | * sysdep.c (LC_COLLATE, LC_COLLATE_MASK): Give individual defaults |