diff options
| author | Glenn Morris | 2014-10-03 09:05:12 -0700 |
|---|---|---|
| committer | Glenn Morris | 2014-10-03 09:05:12 -0700 |
| commit | 2ae68b8b152f7fcc987c9efd0eacf6b768703b71 (patch) | |
| tree | 519ee9f1b0611135bcdab2a976367d94b5962eb3 /src | |
| parent | 79a90058ec11dbb56665e85a6631e4b8b5e7a6c6 (diff) | |
| download | emacs-2ae68b8b152f7fcc987c9efd0eacf6b768703b71.tar.gz emacs-2ae68b8b152f7fcc987c9efd0eacf6b768703b71.zip | |
ChangeLog merge fix
Yet another unlabelled backport.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index ab5621b9664..3260af49d11 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,9 +1,3 @@ | |||
| 1 | 2014-10-03 Dmitry Antipov <dmantipov@yandex.ru> | ||
| 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> | 1 | 2014-10-03 Eli Zaretskii <eliz@gnu.org> |
| 8 | 2 | ||
| 9 | * xdisp.c (move_it_by_lines): Call reseat_1 after moving the | 3 | * xdisp.c (move_it_by_lines): Call reseat_1 after moving the |