merge emacs

[gnu-emacs] / src / ChangeLog

diff --git a/src/ChangeLog b/src/ChangeLog
index ff9f771b77938a11135c1c2e61e261f4d3106836..1ecd7f159a25a382b7920046bb96d46aa4740b28 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2013-06-18  Kenichi Handa  <handa@gnu.org>
+
+       * font.c (Ffont_spec): Signal an error for an invalid font name.
+
 2013-06-18  Paul Eggert  <eggert@cs.ucla.edu>
 
        Porting fixes for merged specpdl and backtrace stacks (Bug#14643).