merge trunk

[bpt/emacs.git] / src / ChangeLog.10

diff --git a/src/ChangeLog.10 b/src/ChangeLog.10
index c878c48..57c1cbf 100644 (file)
--- a/src/ChangeLog.10
+++ b/src/ChangeLog.10
@@ -1865,7 +1865,7 @@
 
 2006-10-07  Ralf Angeli  <angeli@caeruleus.net>
 
-       * w32fns.c (w32_createwindow): Honour left and top positions if
+       * w32fns.c (w32_createwindow): Honor left and top positions if
        supplied explicitly.
 
 2006-10-06  Kim F. Storm  <storm@cua.dk>
@@ -19171,7 +19171,7 @@
        * coding.c (code_convert_region_unwind):
        Set Vlast_coding_system_used to the argument.
        (code_convert_region): If post-read-conversion function changed
-       the value of last-coding-sytem, keep the new value in
+       the value of last-coding-system, keep the new value in
        coding->symbol so that it won't be overridden.
        (run_pre_post_conversion_on_str): Likewise.
        (coding_system_accept_latin_extra_p): New function.