Merge from origin/emacs-24

[gnu-emacs] / src / ChangeLog.10

diff --git a/src/ChangeLog.10 b/src/ChangeLog.10
index f6d602b831b07460ba9686caede2ff5a444b8f19..58a67e863bf8208e449bf31aa52688f87b338243 100644 (file)
--- a/src/ChangeLog.10
+++ b/src/ChangeLog.10
@@ -20769,7 +20769,7 @@
 
        * fontset.c (syms_of_fontset): Setup Vfont_encoding_alist here.
 
-       * editfns.c (Fformat): Convert an unibyte char argument that is
+       * editfns.c (Fformat): Convert a unibyte char argument that is
        formatted by "%c" to multibyte if the total result must be a
        multibyte string.