Merge from trunk.

1 files changed, 3 insertions, 3 deletions

diff --git a/src/ChangeLog.7 b/src/ChangeLog.7
index fa55d6974ad..ec4c27a4d9e 100644
--- a/src/ChangeLog.7
+++ b/src/ChangeLog.7
@@ -5943,7 +5943,7 @@
         Vauto_file_coding_system.
         (syms_of_fileio): Adjusted for the above change.  Doc change.
         (Finsert_file_contents): The argument for Vset_auto_coding is a
-        concatination of the heading 1K-byte and the tailing 3K-byte.
+        concatenation of the heading 1K-byte and the tailing 3K-byte.
 
         * cmds.c (internal_self_insert): Only set TARGET_CLM when C2 is tab.
         When multibyte characters are disabled,
@@ -7485,7 +7485,7 @@
 
 1997-06-09  Kenichi Handa  <handa@etl.go.jp>
 
-        * buffer.c (init_buffer_once): Inititialize the member
+        * buffer.c (init_buffer_once): Initialize the member
         buffer_file_coding_system.
         (syms_of_buffer): Declare Lisp variables
         default-buffer-file-coding-system and buffer-file-coding-system.
@@ -10963,7 +10963,7 @@
 1996-08-28  Morten Welinder  <terra@diku.dk>
 
         * minibuf.c (Vhistory_length, Qhistory_length): New variables.
-        (syms_of_minibuf): Register and initialise these.
+        (syms_of_minibuf): Register and initialize these.
         (read_minibuf): Truncate history list if needed.
 
 1996-08-28  Richard Stallman  <rms@psilocin.gnu.ai.mit.edu>