Merge from emacs--rel--22

[gnu-emacs] / lisp / ChangeLog.7

diff --git a/lisp/ChangeLog.7 b/lisp/ChangeLog.7
index 0b9986e993f1427287b11697f86068790026d43a..31b292b6fed136d1aac2cb093768b793ad41abb0 100644 (file)
--- a/lisp/ChangeLog.7
+++ b/lisp/ChangeLog.7
@@ -17972,7 +17972,7 @@
 
        * faces.el (x-make-font-bold-italic): New function.
 
-       * fontset.el (x-decompose-font-name): While seting each field of
+       * fontset.el (x-decompose-font-name): While setting each field of
        XLFD, set "*" instead of nil to a field which is omitted in the
        original font name.
        (generate-fontset-menu): Delete code for handling alias (or