[Emacs-diffs] trunk r118028: ChangeLog merge fix

[Glenn Morris]

------------------------------------------------------------
revno: 118028
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Fri 2014-10-03 09:05:12 -0700
message:
  ChangeLog merge fix
  Yet another unlabelled backport.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-10-03 15:44:46 +0000
+++ b/src/ChangeLog     2014-10-03 16:05:12 +0000
@@ -1,9 +1,3 @@
-2014-10-03  Dmitry Antipov  <address@hidden>
-
-       * 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  <address@hidden>
 
        * xdisp.c (move_it_by_lines): Call reseat_1 after moving the