From: Glenn Morris <rgm@gnu.org>
Date: Fri, 3 Oct 2014 16:05:12 +0000 (-0700)
Subject: ChangeLog merge fix
X-Git-Tag: emacs-25.0.90~2635^2~679^2~143
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2ae68b8b152f7fcc987c9efd0eacf6b768703b71;p=emacs.git

ChangeLog merge fix
Yet another unlabelled backport.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index ab5621b9664..3260af49d11 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,9 +1,3 @@
-2014-10-03  Dmitry Antipov  <dmantipov@yandex.ru>
-
-	* 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  <eliz@gnu.org>
 
 	* xdisp.c (move_it_by_lines): Call reseat_1 after moving the