Merge from trunkpending

1 files changed, 15 insertions, 16 deletions

diff --git a/src/ChangeLog.7 b/src/ChangeLog.7
index d5bebec660f..0952826e8c6 100644
--- a/src/ChangeLog.7
+++ b/src/ChangeLog.7
@@ -331,7 +331,7 @@
 
 1998-07-30  Paul Eggert  <eggert@twinsun.com>
 
-        * src/Makefile.in (widget.o, xfns.o, xmenu.o):
+        * Makefile.in (widget.o, xfns.o, xmenu.o):
         Prepend $(srcdir)/ to rule dependencies outside this dir.
 
 1998-07-29  Kenichi Handa  <handa@etl.go.jp>
@@ -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
@@ -4884,14 +4884,13 @@
         The new GNU C library strftime needs the underlying host's
         strftime for locale dependent formats.
 
-        * configure.in (AC_CHECK_FUNCS): Add strftime.
-        * src/config.in (HAVE_STRFTIME): New undef.
-        * src/editfns.c (emacs_strftime): New decl.
+        * config.in (HAVE_STRFTIME): New undef.
+        * editfns.c (emacs_strftime): New decl.
         (Fformat_time_string): Doc fix: %b, %h, %B, %a, %A, and %p depend on
         locale; don't use actual chars to describe %n and %t.
 
-        * src/Makefile.in (strftime.o):
-        * src/makefile.nt ($(BLD)\strftime.obj):
+        * Makefile.in (strftime.o):
+        * makefile.nt ($(BLD)\strftime.obj):
         No need to compile with -Dstrftime=emacs_strftime any more.
 
 1997-11-22  Richard Stallman  <rms@gnu.org>
@@ -5774,7 +5773,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 +5942,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 +6316,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 +7398,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 +7484,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 +10962,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,7 +11091,7 @@ See ChangeLog.6 for earlier changes.
 ;; coding: utf-8
 ;; End:
 
-  Copyright (C) 1997-1998, 2001-2011  Free Software Foundation, Inc.
+  Copyright (C) 1997-1998, 2001-2012  Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.