[Emacs-diffs] emacs-26 9d31a97: ; Spelling fixes

[Paul Eggert]

branch: emacs-26
commit 9d31a970927aae027155778a2ec2782c52ff63c6
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>

    ; Spelling fixes
---
 ChangeLog.2                              |  6 ++--
 ChangeLog.3                              | 50 ++++++++++++++++----------------
 admin/nt/dist-build/README-scripts       |  8 ++---
 admin/nt/dist-build/build-dep-zips.py    |  4 +--
 lisp/ChangeLog.17                        |  2 +-
 lisp/ChangeLog.9                         |  2 +-
 lisp/url/url-tramp.el                    |  4 +--
 src/ChangeLog.13                         |  4 +--
 test/manual/etags/html-src/software.html |  4 +--
 9 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/ChangeLog.2 b/ChangeLog.2
index a412d3b..cab30d8 100644
--- a/ChangeLog.2
+++ b/ChangeLog.2
@@ -7523,11 +7523,11 @@
 
 2016-02-23  Jan Tatarik  <address@hidden>
 
-       Don't bug out on localised dates in gnus-icalendar
+       Don't bug out on localized dates in gnus-icalendar
 
        * lisp/gnus/gnus-icalendar.el
        (gnus-icalendar-event:org-timestamp): Don't bug out on
-       localised dates.
+       localized dates.
 
 2016-02-23  Drew Adams  <address@hidden>
 
@@ -26654,7 +26654,7 @@
        Introduce new macros to cover Emacs's new names in cl-lib.el
        This also eliminates `mapcan' warnings in XEmacs.
        * lisp/progmodes/cc-defs.el (c--mapcan-status): New variable to
-       characterise [X]Emacs versions.
+       characterize [X]Emacs versions.
        (top-level): Require either 'cl or 'cl-lib, depending on
        c--mapcan-status.
        Change this back to cc-external-require from an eval-when-compile
diff --git a/ChangeLog.3 b/ChangeLog.3
index 2d7f3bb..4962e1e 100644
--- a/ChangeLog.3
+++ b/ChangeLog.3
@@ -4336,8 +4336,8 @@
 
        * lisp/progmodes/cc-mode.el (c-parse-quotes-before-change)
        (c-parse-quotes-after-change): Rewrite the functions, simplifying
-       considerably, and removing unnecessary optimisations.  Invalidate two 
caches
-       after manipulating text properties.
+       considerably, and removing unnecessary optimizations.
+       Invalidate two caches after manipulating text properties.
 
 2017-09-03  Alan Mackenzie  <address@hidden>
 
@@ -7462,7 +7462,7 @@
        The error happened when there was a comma inside template delimiters.
 
        * lisp/progmodes/cc-fonts.el (c-get-fontification-context): In "for"
-       statements, recognise template delimiters containing "," and "&".
+       statements, recognize template delimiters containing "," and "&".
 
 2017-07-27  Michael Albinus  <address@hidden>
 
@@ -17907,7 +17907,7 @@
 
        * src/casefiddle.c (struct casing_context, prepare_casing_context): Add
        titlecase_char_table member.  It’s set to the ‘titlecase’ Unicode
-       property table if capitalisation has been requested.
+       property table if capitalization has been requested.
        (case_character): Make use of the titlecase_char_table to title-case
        initial characters when capitalising.
 
@@ -17923,7 +17923,7 @@
        the logic easier.  This commit introduces no functionality changes.
 
        * src/casefiddle.c (struct casing_context, prepare_casing_context): New
-       sturcture for saving casing context and function to initialise it.
+       sturcture for saving casing context and function to initialize it.
        (case_character): New function which cases character base on provided
        context.
        (do_casify_integer, do_casify_multibyte_string,
@@ -21210,7 +21210,7 @@
 
 2017-02-24  Stefan Monnier  <address@hidden>
 
-       Minor redisplay optimisations
+       Minor redisplay optimizations
 
        * src/frame.c (Ficonify_frame): No need to redisplay everything.
 
@@ -24018,9 +24018,9 @@
 
 2017-01-26  Lars Ingebrigtsen  <address@hidden>
 
-       (message-do-fcc): Modernise the code slightly.
+       (message-do-fcc): Modernize the code slightly.
 
-       * lisp/gnus/message.el (message-do-fcc): Modernise the code slightly.
+       * lisp/gnus/message.el (message-do-fcc): Modernize the code slightly.
 
 2017-01-26  Lars Ingebrigtsen  <address@hidden>
 
@@ -26014,7 +26014,7 @@
 
 2016-12-30  Alan Mackenzie  <address@hidden>
 
-       CC Mode: Fix the fontification of a spuriously recognised enum member.
+       CC Mode: Fix the fontification of a spuriously recognized enum member.
 
        The "enum" was in an argument list, but triggered the fontification of a
        following identifier in the function block as though it were in an enum
@@ -26130,7 +26130,7 @@
        Partially correct fontification of "(b*3)", and the like, in C++ Mode
 
        This problem is caused by the fundamental ambiguity in C++ between
-       argument declarations and initialisation clauses.
+       argument declarations and initialization clauses.
 
        * lisp/progmodes/cc-fonts.el (c-font-lock-declarations): If we have an 
open
        paren preceded by an arithmetic operator, we give this the context nil, 
not
@@ -27358,7 +27358,7 @@
 
 2016-12-13  Reuben Thomas  <address@hidden>
 
-       Generalise over-specific documentation
+       Generalize over-specific documentation
 
        * lisp/textmodes/ispell.el (ispell-personal-dictionary): Rather than
        document precise personal wordlist filenames for only two supported
@@ -32608,7 +32608,7 @@
 
        Fix compatibility with macOS 10.12 pmset (bug#24537)
 
-       * lisp/battery.el (battery-pmset): Recognise and ignore battery id if
+       * lisp/battery.el (battery-pmset): Recognize and ignore battery id if
        present in output.
 
 2016-09-30  Paul Eggert  <address@hidden>
@@ -33284,7 +33284,7 @@
 
 2016-09-12  Michal Nazarewicz  <address@hidden>
 
-       Fix compiler thinking width and height may be unitialised in frame.c
+       Fix compiler thinking width and height may be unitialized in frame.c
 
        This fixes the following warning:
 
@@ -33300,7 +33300,7 @@
 
 2016-09-12  Michal Nazarewicz  <address@hidden>
 
-       Fix compiler thinking tmpdir may be unitialised in emacsclient
+       Fix compiler thinking tmpdir may be unitialized in emacsclient
 
        This fixes the following warning:
 
@@ -34473,7 +34473,7 @@
        template declaration.
        (c-inside-bracelist-p): Call c-looking-at-or-maybe-in-bracelist in 
place of
        much inline code.
-       (c-looking-at-inexpr-block): Amend so that it won't wrongly recognise an
+       (c-looking-at-inexpr-block): Amend so that it won't wrongly recognize an
        initialization starting "({" as an in-expression block, by checking for
        semicolons, as opposed to commas, separating elements inside it.
        (c-guess-continued-construct): (CASE B-2): Recognize a brace-list-open 
by
@@ -35939,7 +35939,7 @@
 
        * doc/misc/ses.texi (Printer functions): Split the node into 5
        sub-nodes + add some extra documentation.
-       (Various kinds of printer functions): Make an itemisation to
+       (Various kinds of printer functions): Make an itemization to
        disintguish better the 3 types of printers, give an example of
        lambda printer definition.
        (Standard printer functions): Add documentation for ses-prin1
@@ -36049,7 +36049,7 @@
 
        Fix ‘[[:cc:]]*literal’ regex failing to match ‘literal’ (bug#24020)
 
-       The regex engine tries to optimise Kleene star by avoiding backtracking
+       The regex engine tries to optimize Kleene star by avoiding backtracking
        when it can detect that star’s operand cannot match what follows it in
        the pattern.
 
@@ -36063,7 +36063,7 @@
        engine knows whatever would be put back into the string cannot possibly
        match literal digit one so no backtracking will be attempted.
 
-       In the regexes of the form ‘[[:CC:]]*X’, the optimisation can be applied
+       In the regexes of the form ‘[[:CC:]]*X’, the optimization can be applied
        if the character class CC does not match character X.  In the above
        example, this holds because digit one is not in alpha character class.
 
@@ -36072,7 +36072,7 @@
        that character classes do not match multibyte characters.  For example,
        it would incorrectly conclude that [[:alpha:]] doesn’t match ‘ż’.
 
-       This, in turn, led to the aforementioned Kleene star optimisation being
+       This, in turn, led to the aforementioned Kleene star optimization being
        incorrectly applied in patterns such as ‘[[:graph:]]*☠’ (which should
        match ‘☠’ but doesn’t as can be tested by executing
            (string-match-p "[[:graph:]]*☠" "☠")
@@ -44436,7 +44436,7 @@
        bd58c13 Improve documentation of focus-related hooks
        00a4720 Further improve doc string of 'disable-point-adjustment'
        c582def Further adaptions in file-notify-tests.el for w32notify
-       a1585e1 Don't bug out on localised dates in gnus-icalendar
+       a1585e1 Don't bug out on localized dates in gnus-icalendar
 
 2016-03-03  John Wiegley  <address@hidden>
 
@@ -44957,10 +44957,10 @@
 
 2016-02-25  Jan Tatarik  <address@hidden>
 
-       Don't use (localised) week days in dates
+       Don't use (localized) week days in dates
 
        * lisp/gnus/gnus-icalendar.el
-       (gnus-icalendar-event:org-timestamp): Don't use (localised)
+       (gnus-icalendar-event:org-timestamp): Don't use (localized)
        week days in the dates, because that messes up things later.
 
 2016-02-25  Thierry Volpiatto  <address@hidden>
@@ -47224,7 +47224,7 @@
 
 2016-02-08  Michal Nazarewicz  <address@hidden>
 
-       Optimise ‘point in message header’ check
+       Optimize ‘point in message header’ check
 
        * lisp/gnus/message.el (message-point-in-header-p): Replace two unbound
        regular expression matches with a single bound string match thus
@@ -48169,7 +48169,7 @@
        * src/gnutls.c (Fgnutls_mark_process): New function.
 
        * src/process.c (send_process): Don't write to GnuTLS sockets that
-       haven't been initialised yed.
+       haven't been initialized yed.
 
        * src/process.h: New slot gnutls_wait_p.
 
@@ -48668,7 +48668,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
diff --git a/admin/nt/dist-build/README-scripts 
b/admin/nt/dist-build/README-scripts
index a20099e..1c62a86 100644
--- a/admin/nt/dist-build/README-scripts
+++ b/admin/nt/dist-build/README-scripts
@@ -3,19 +3,19 @@ Distribution Build Scripts for Windows
 
 The scripts are used to build the binary distribution zip files for windows.
 
-File System Organisation
+File System Organization
 ------------------------
 
 
-They are relatively strict about the file system organisation. In
+They are relatively strict about the file system organization. In
 general, they should work across several more than just the version of
 Emacs they come with, as the dependencies of Emacs change relatively slowly.
 
-The file system needs to be organised like so:
+The file system needs to be organized like so:
 
 ~/emacs-build/git
 
-Contains a checkout of the Emacs git repository, organised according
+Contains a checkout of the Emacs git repository, organized according
 to branches, with git worktree
 
 ~/emacs-build/git/emacs-$branch
diff --git a/admin/nt/dist-build/build-dep-zips.py 
b/admin/nt/dist-build/build-dep-zips.py
index 33bc4b5..9573bf3 100755
--- a/admin/nt/dist-build/build-dep-zips.py
+++ b/admin/nt/dist-build/build-dep-zips.py
@@ -61,7 +61,7 @@ mingw-w64-x86_64-xpm-nox
 mingw-w64-x86_64-lcms2'''.split()
 
     # Get a list of all dependencies needed for packages mentioned above.
-    # Run `pactree -lu' for each elment of $PKG_REQ
+    # Run `pactree -lu' for each element of $PKG_REQ.
     pkgs = set()
     for x in PKG_REQ:
         pkgs.update(
@@ -125,7 +125,7 @@ def gather_source(deps):
     ## mpc, termcap, xpm -- has x86_64, and i686 versions
 
     ## This needs to have been run first at the same time as the
-    ## system was udpated.
+    ## system was updated.
     os.mkdir("emacs-src")
     os.chdir("emacs-src")
 
diff --git a/lisp/ChangeLog.17 b/lisp/ChangeLog.17
index 1bd882f..bb3375b 100644
--- a/lisp/ChangeLog.17
+++ b/lisp/ChangeLog.17
@@ -23666,7 +23666,7 @@
 
 2013-05-28  Alan Mackenzie  <address@hidden>
 
-       Handle "capitalised keywords" correctly.
+       Handle "capitalized keywords" correctly.
        * progmodes/cc-mode.el (c-after-change): Bind case-fold-search to nil.
 
 2013-05-28  Aidan Gauland  <address@hidden>
diff --git a/lisp/ChangeLog.9 b/lisp/ChangeLog.9
index 376589f..16e0a88 100644
--- a/lisp/ChangeLog.9
+++ b/lisp/ChangeLog.9
@@ -2033,7 +2033,7 @@
        (uniquify-get-proposed-name): Arguments changed, callers changed.
        (uniquify-rationalize-conflicting-sublist): Explicitly reset the
        uniquify-possibly-resolvable flag, which is no more bound locally.
-       (uniquify-rename-buffer): Do not set the old unrationalised-buffer
+       (uniquify-rename-buffer): Do not set the old unrationalized-buffer
        flag, which does not exist any more.
 
 2001-07-23  Eli Zaretskii  <address@hidden>
diff --git a/lisp/url/url-tramp.el b/lisp/url/url-tramp.el
index 0b07bd0..f4149dd 100644
--- a/lisp/url/url-tramp.el
+++ b/lisp/url/url-tramp.el
@@ -39,7 +39,7 @@ They must also be covered by `url-handler-regexp'."
 (defun url-tramp-convert-url-to-tramp (url)
   "Convert URL to a Tramp file name.
 If URL contains a password, it will be added to the `password-data' cache.
-In case URL is not convertable, nil is returned."
+In case URL is not convertible, nil is returned."
   (let* ((obj (url-generic-parse-url (and (stringp url) url)))
          (port
           (and (natnump (url-portspec obj))
@@ -57,7 +57,7 @@ In case URL is not convertable, nil is returned."
 
 (defun url-tramp-convert-tramp-to-url (file)
   "Convert FILE, a Tramp file name, to a URL.
-In case FILE is not convertable, nil is returned."
+In case FILE is not convertible, nil is returned."
   (let* ((obj (ignore-errors (tramp-dissect-file-name file)))
          (port
           (and (stringp (tramp-file-name-port obj))
diff --git a/src/ChangeLog.13 b/src/ChangeLog.13
index e252acf..9f3fdee 100644
--- a/src/ChangeLog.13
+++ b/src/ChangeLog.13
@@ -16581,7 +16581,7 @@
        (characterIndexForPoint:): Adjust return type depending on GNUstep
        version.
        (mouseDown:): delta is CGFloat.
-       (updateFrameSize): Remove unised variable f.
+       (updateFrameSize): Remove unused variable f.
        (initFrameFromEmacs): Move toggleButton inside NS_IMPL_COCOA.
        Cast float to EmacsCGFloat.
        (windowWillUseStandardFrame:defaultFrame:): Set maximized_height
@@ -16593,7 +16593,7 @@
        (setPosition:portion:whole:): por is CGFloat.
        (getMouseMotionPart:window:x:y:): Add F suffix to float.
        (mouseDown:): Use CGFloat.
-       (mouseDragged:): Remove unised variable edge.
+       (mouseDragged:): Remove unused variable edge.
        (EmacsDocument): Implement for NS_IMPL_GNUSTEP.
 
        * nsterm.h (EmacsCGFloat): Typedef for OSX and GNUstep when the size
diff --git a/test/manual/etags/html-src/software.html 
b/test/manual/etags/html-src/software.html
index 7a85b9a..9c4f0dd 100644
--- a/test/manual/etags/html-src/software.html
+++ b/test/manual/etags/html-src/software.html
@@ -75,7 +75,7 @@
     protocol studies:
     <UL>
     <LI> <A 
HREF="/curriculum/pot-abstracts.html#R03:FODAIBEAvsDistributed-IJSC96">
-         <i>Comparison between distributed and centralised demand
+         <i>Comparison between distributed and centralized demand
         assignment TDMA satellite access schemes</i></A>
 
     <LI><A HREF="/curriculum/pot-abstracts.html#R07:FODAIBEAvsCFRA-IJSC97">
@@ -225,7 +225,7 @@ if that happens so I can update this page.
   decoding.  I keep a <A HREF="codes.html">mirror</A> of this page.
 
  <DT>Forward error correcting codes by Phil Karn
-  <DD>Phil Karn's optimised really <A HREF="http://www.ka9q.net/code/fec/";>free
+  <DD>Phil Karn's optimized really <A HREF="http://www.ka9q.net/code/fec/";>free
   codes</A>.
 
 </DL>