diff options
| author | Glenn Morris | 2014-10-03 08:44:46 -0700 |
|---|---|---|
| committer | Glenn Morris | 2014-10-03 08:44:46 -0700 |
| commit | 79a90058ec11dbb56665e85a6631e4b8b5e7a6c6 (patch) | |
| tree | 05b98c0a7fd698fe8fca5d62276aa1ac8173fbb3 /src/ChangeLog | |
| parent | 09ca95288cc53ec29a47777f192cae8ff62c2fd0 (diff) | |
| parent | 3ef486a9acce48f9e23a56a11a3e62727d8e714f (diff) | |
| download | emacs-79a90058ec11dbb56665e85a6631e4b8b5e7a6c6.tar.gz emacs-79a90058ec11dbb56665e85a6631e4b8b5e7a6c6.zip | |
Merge from emacs-24; up to 2014-07-16T17:06:12Z!rgm@gnu.org
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 3b263892c1e..ab5621b9664 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,16 @@ | |||
| 1 | 2014-10-03 Dmitry Antipov <dmantipov@yandex.ru> | 1 | 2014-10-03 Dmitry Antipov <dmantipov@yandex.ru> |
| 2 | 2 | ||
| 3 | * font.c (font_list_entities): Do not add empty vector to font cache. | ||
| 4 | (font_matching_entity): Likewise. If matching entity is found, insert | ||
| 5 | 1-item vector with this entity instead of an entity itself (Bug#17125). | ||
| 6 | |||
| 7 | 2014-10-03 Eli Zaretskii <eliz@gnu.org> | ||
| 8 | |||
| 9 | * xdisp.c (move_it_by_lines): Call reseat_1 after moving the | ||
| 10 | iterator backwards, to resync the bidi iterator. (Bug#18584) | ||
| 11 | |||
| 12 | 2014-10-03 Dmitry Antipov <dmantipov@yandex.ru> | ||
| 13 | |||
| 3 | Consistently use min and max macros from lisp.h. | 14 | Consistently use min and max macros from lisp.h. |
| 4 | * coding.c (min, max): | 15 | * coding.c (min, max): |
| 5 | * font.c (MAX): | 16 | * font.c (MAX): |