[Emacs-diffs] emacs-25 cf79616: ; Spelling fixes

[Paul Eggert]

branch: emacs-25
commit cf79616133778ff6a0ec4a7745f0f8f9fb5bd8ee
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>

    ; Spelling fixes
---
 ChangeLog.2           |    6 +++---
 lisp/ChangeLog.13     |    2 +-
 lisp/ChangeLog.17     |    2 +-
 lisp/doc-view.el      |    4 ++--
 lisp/gnus/ChangeLog.3 |    6 +++---
 src/emacs.c           |    4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/ChangeLog.2 b/ChangeLog.2
index f6d67e2..e441fd1 100644
--- a/ChangeLog.2
+++ b/ChangeLog.2
@@ -1594,7 +1594,7 @@
        that as the same name can be used for different locations in different
        SES sheets ; 2) use `local-variable-if-set-p' rather than `boundp' and
        `local-variable-p' to check if cell name is already in use in this
-       sheet or needs initialisation.
+       sheet or needs initialization.
        (ses-relocate-all): Cell value relocation : 1) like for name
        relocation use the `ses-cell' property rather than comparing actual
        name to corresponding standard name. 2) Correct bug introduced in
@@ -9622,7 +9622,7 @@
        (unexec): Don't search for bss style sections by name.  Instead,
        use the last PT_LOAD header address range covered by p_memsz
        but not p_filesz and match any SHT_NOBITS section in that
-       address range.  Simplify initialisation of section header vars.
+       address range.  Simplify initialization of section header vars.
        Don't assume that section headers are above bss segment.  Move
        copying of bss area out of section loop.  Align .data2 section
        to 1, since it now covers the entire bss area.  For SHT_NOBITS
@@ -9680,7 +9680,7 @@
        Separate out some of the more mechanical changes so following patches
        are smaller.
 
-       * src/unexelf.c (unexec): Rearrange initialisation of program
+       * src/unexelf.c (unexec): Rearrange initialization of program
        header vars.  Use pointer vars in loops rather than indexing
        section header array via macros.  Simplify _OBJC_ sym code
        and reloc handling code.
diff --git a/lisp/ChangeLog.13 b/lisp/ChangeLog.13
index 041e8c0..d792889 100644
--- a/lisp/ChangeLog.13
+++ b/lisp/ChangeLog.13
@@ -7656,7 +7656,7 @@
 2007-11-07  Glenn Morris  <address@hidden>
 
        * emulation/tpu-mapper.el (tpu-map-key): Use unless rather than cond.
-       Remove superfluous concats.  Move final set-buffer to
+       Remove superfluous concatenations.  Move final set-buffer to
        non-emacs-specific code.
 
 2007-11-07  Rob Riepel  <address@hidden>
diff --git a/lisp/ChangeLog.17 b/lisp/ChangeLog.17
index 1785a33..ee03661 100644
--- a/lisp/ChangeLog.17
+++ b/lisp/ChangeLog.17
@@ -1758,7 +1758,7 @@
 
        * net/shr.el (shr-insert): Make sure the space inserted has the
        right font (for width).
-       (shr-fill-line): Preserve background colours when indenting/folding.
+       (shr-fill-line): Preserve background colors when indenting/folding.
        (shr-ensure-paragraph): Don't insert a new paragraph as the first
        item in a <li>.
 
diff --git a/lisp/doc-view.el b/lisp/doc-view.el
index bc5c1d2..4cf4ce2 100644
--- a/lisp/doc-view.el
+++ b/lisp/doc-view.el
@@ -699,8 +699,8 @@ It's a subdirectory of `doc-view-cache-directory'."
            (concat (thread-last (file-name-nondirectory 
doc-view--buffer-file-name)
                       ;; bug#13679
                       (subst-char-in-string ?% ?_)
-                      ;; arc-mode concats archive name and file name
-                      ;; with colon which is illegal on Windows.
+                      ;; arc-mode concatenates archive name and file name
+                      ;; with colon, which is illegal on MS-Windows.
                       (subst-char-in-string ?: ?_))
                     "-"
                     (let ((file doc-view--buffer-file-name))
diff --git a/lisp/gnus/ChangeLog.3 b/lisp/gnus/ChangeLog.3
index 5e7e95b..e6cbe04 100644
--- a/lisp/gnus/ChangeLog.3
+++ b/lisp/gnus/ChangeLog.3
@@ -1732,7 +1732,7 @@
        * eww.el (eww-convert-widgets): Put `help-echo' on input fields so that
        we can navigate to them.
 
-       * shr.el (shr-colorize-region): Put the colours over the entire region.
+       * shr.el (shr-colorize-region): Put the colors over the entire region.
        (shr-inhibit-decoration): New variable.
        (shr-add-font): Use it to inhibit text property decorations while doing
        preliminary table renderings.  This speeds up typical Wikipedia page
@@ -1824,7 +1824,7 @@
        * shr.el (shr-expand-url): Respect // URLs.
 
        * eww.el (eww-tag-body): Override the shr body rendering so that we can
-       put a background colour onto the entire buffer.
+       put a background color onto the entire buffer.
        (eww-render): When being redirected, use the redirect URL as the new
        base URL.
 
@@ -3514,7 +3514,7 @@
 
        * mm-archive.el (mm-archive-decoders): Add support for tar.
 
-       * gnus.el (gnus-logo-color-alist): Change the colours for Ma Gnus.
+       * gnus.el (gnus-logo-color-alist): Change the colors for Ma Gnus.
 
        * nnmail.el (nnmail-extra-headers): Add Cc to the default.
 
diff --git a/src/emacs.c b/src/emacs.c
index ab5d777..9bf996a 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -1311,8 +1311,8 @@ Using an Emacs configured with --with-x-toolkit=lucid 
does not have this problem
 #endif
 
 #ifdef HAVE_NS
-  /* Initialise the locale from user defaults. */
-  ns_init_locale();
+  /* Initialize the locale from user defaults.  */
+  ns_init_locale ();
 #endif
 
   /* Initialize and GC-protect Vinitial_environment and