diff options
| author | Joakim Verona | 2013-08-24 15:17:24 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-08-24 15:17:24 +0200 |
| commit | 8131fcfd622dd2b7fccf09b0f6a1c3f4747619a7 (patch) | |
| tree | e5b0c25192c49084a07e61dcee99f98cfabef5db /src/ChangeLog | |
| parent | 88475263ceab0e918384ae21d531893012c42954 (diff) | |
| parent | 11f20add707674b98227ca6f26d0e7f10dbbfac9 (diff) | |
| download | emacs-8131fcfd622dd2b7fccf09b0f6a1c3f4747619a7.tar.gz emacs-8131fcfd622dd2b7fccf09b0f6a1c3f4747619a7.zip | |
merge from trunk
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 2bb41071fd6..70d722a02a4 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,9 @@ | |||
| 1 | 2013-08-24 Eli Zaretskii <eliz@gnu.org> | 1 | 2013-08-24 Eli Zaretskii <eliz@gnu.org> |
| 2 | 2 | ||
| 3 | * xdisp.c (get_next_display_element): Don't apply to characters | ||
| 4 | from a display vector the logic of setting it->end_of_box_run_p | ||
| 5 | suitable for characters from a buffer. (Bug#15175) | ||
| 6 | |||
| 3 | * w32.c (fdutimens): Call 'utime', which is implemented on w32.c | 7 | * w32.c (fdutimens): Call 'utime', which is implemented on w32.c |
| 4 | to handle directories, rather than '_utime' which doesn't. | 8 | to handle directories, rather than '_utime' which doesn't. |
| 5 | (Bug#15176) | 9 | (Bug#15176) |