1 files changed, 6 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 43358338c4d..a794eb9eb90 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,11 @@
 2011-04-11  Paul Eggert  <eggert@cs.ucla.edu>
 
+        font.c: Make copy_font_spec and merge_font_spec ordinary C functions.
+        * font.c (copy_font_spec): Rename from Fcopy_font_spec, since it
+        was inaccessible from Lisp.
+        (merge_font_spec): Likewise, renaming from Fmerge_font_spec.
+        * font.c, font.h, fontset.c, xfaces.c, xfont.c: Change all uses.
+
         alloc.c: Import and export fewer symbols, and remove unused items.
         * lisp.h (suppress_checking, die): Declare only if ENABLE_CHECKING
         is defined.