Merge from trunk.

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

diff --git a/src/ChangeLog.7 b/src/ChangeLog.7
index b592710..891c1ca 100644 (file)
--- a/src/ChangeLog.7
+++ b/src/ChangeLog.7
@@ -592,7 +592,7 @@
 
        * coding.h (Qemacs_mule): Extern it.
 
-       * process.c (init_process): Initilize Vdefault_process_coding_system.
+       * process.c (init_process): Initialize Vdefault_process_coding_system.
 
 1998-06-26  Kenichi Handa  <handa@etl.go.jp>
 
@@ -972,7 +972,7 @@
 
 1998-06-01  Ken'ichi Handa  <handa@melange.gnu.org>
 
-       * coding.c (detect_coding_mask): Initilize local variable C.
+       * coding.c (detect_coding_mask): Initialize local variable C.
 
 1998-06-01  Richard Stallman  <rms@gnu.org>
 
@@ -3968,7 +3968,7 @@
 
 1998-01-12  Kenichi Handa  <handa@etl.go.jp>
 
-       * minibuf.c (Fminibuffer_complete_word): Fix a bug of refering
+       * minibuf.c (Fminibuffer_complete_word): Fix a bug of referring
        `i'.  We must refer `i_byte' instead.
 
        * insdel.c (insert_from_string_1): Decrement GAP_SIZE by
@@ -5774,7 +5774,7 @@
 
        (w32_initialize): Set input mode.  Use w32_msg_worker instead
        of windows_msg_worker.  Dynamically link proportional scroll bar
-       functions and intialize proportional scroll bar variables.
+       functions and initialize proportional scroll bar variables.
        (syms_of_w32term): DEFVAR new variables.
 
        * w32term.h (w32_output): New fields menubar_widget, menubar_active,
@@ -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,
@@ -6317,7 +6317,7 @@
        (ENCODE_ISO_CHARACTER_DIMENSION2): Likewise.
        (safe_terminal_coding): New variable.
        (Fset_safe_terminal_coding_system_internal): New function.
-       (init_coding_once): Initilize safe_terminal_coding.
+       (init_coding_once): Initialize safe_terminal_coding.
        (syms_of_coding): Declare set-safe-terminal-coding-system as a
        Lisp function.
 
@@ -7399,7 +7399,7 @@
 
 1997-06-18  Kenichi Handa  <handa@etl.go.jp>
 
-       * coding.c (detect_coding_iso2022): Initilize mask correctly.
+       * coding.c (detect_coding_iso2022): Initialize mask correctly.
 
        * fns.c (concat): Pay attention to multibyte characters when
        TARGET_TYPE is Lisp_String.
@@ -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>
@@ -11092,8 +11092,7 @@ See ChangeLog.6 for earlier changes.
 ;; coding: utf-8
 ;; End:
 
-    Copyright (C) 1997, 1998, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-       Free Software Foundation, Inc.
+  Copyright (C) 1997-1998, 2001-2012  Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
@@ -11109,5 +11108,3 @@ See ChangeLog.6 for earlier changes.
 
   You should have received a copy of the GNU General Public License
   along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; arch-tag: 3b03e091-1123-4031-b67d-41683932cc48