Commit 2ae68b8b authored by Glenn Morris's avatar Glenn Morris
Browse files

ChangeLog merge fix

Yet another unlabelled backport.
parent 79a90058
2014-10-03 Dmitry Antipov <>
* font.c (font_list_entities): Do not add empty vector to font cache.
(font_matching_entity): Likewise. If matching entity is found, insert
1-item vector with this entity instead of an entity itself (Bug#17125).
2014-10-03 Eli Zaretskii <>
* xdisp.c (move_it_by_lines): Call reseat_1 after moving the
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment