American English spelling fix.

lisp/font-lock.el

@@ -195,8 +195,8 @@
 ;;   i.e., (b) above, all modes that have items that can be thought of as, say,
 ;;   keywords, should be highlighted with the same face, etc.
 ;; - Make the face attributes fit the concept as far as possible.
-;;   i.e., function names might be a bold colour such as blue, comments might
-;;   be a bright colour such as red, character strings might be brown, because,
+;;   i.e., function names might be a bold color such as blue, comments might
+;;   be a bright color such as red, character strings might be brown, because,
 ;;   err, strings are brown (that was not the reason, please believe me).
 ;; - Don't use a non-nil OVERRIDE unless you have a good reason.
 ;;   Only use OVERRIDE for special things that are easy to define, such as the
@@ -1824,7 +1824,7 @@ Sets various variables using `font-lock-defaults' (or, if nil, using
 	(setq font-lock-keywords
               (font-lock-compile-keywords font-lock-keywords))))))
 
-;;; Colour etc. support.
+;;; Color etc. support.
 
 ;; Note that `defface' will not overwrite any faces declared above via
 ;; `custom-declare-face'.
@@ -1981,7 +1981,7 @@ Sets various variables using `font-lock-defaults' (or, if nil, using
   "Font Lock mode face used to highlight grouping constructs in Lisp regexps."
   :group 'font-lock-faces)
 
-;;; End of Colour etc. support.
+;;; End of Color etc. support.
 
 ;;; Menu support.
 

lisp/gnus/ChangeLog.2

@@ -2390,7 +2390,7 @@
 2003-05-10  Lars Magne Ingebrigtsen  <larsi@gnus.org>
-	* gnus.el (gnus-logo-color-alist): Added no colours.
+	* gnus.el (gnus-logo-color-alist): Added no colors.
 2003-05-09  Dave Love  <fx@gnu.org>

lisp/gnus/mml1991.el

@@ -133,7 +133,7 @@ Whether the passphrase is cached at all is controlled by
 	     'never))
 	cipher
 	(result-buffer (get-buffer-create "*GPG Result*")))
-    ;; Strip MIME Content[^ ]: headers since it will be ASCII ARMOURED
+    ;; Strip MIME Content[^ ]: headers since it will be ASCII ARMORED
     (goto-char (point-min))
     (while (looking-at "^Content[^ ]+:") (forward-line))
     (unless (bobp)
@@ -213,7 +213,7 @@ Whether the passphrase is cached at all is controlled by
   (let ((text (current-buffer))
 	cipher
 	(result-buffer (get-buffer-create "*GPG Result*")))
-    ;; Strip MIME Content[^ ]: headers since it will be ASCII ARMOURED
+    ;; Strip MIME Content[^ ]: headers since it will be ASCII ARMORED
     (goto-char (point-min))
     (while (looking-at "^Content[^ ]+:") (forward-line))
     (unless (bobp)
@@ -303,7 +303,7 @@ Whether the passphrase is cached at all is controlled by
     (let ((cte (save-restriction
 		 (narrow-to-region (point-min) (point))
 		 (mail-fetch-field "content-transfer-encoding"))))
-      ;; Strip MIME headers since it will be ASCII armoured.
+      ;; Strip MIME headers since it will be ASCII armored.
       (forward-line 1)
       (delete-region (point-min) (point))
       (when cte
@@ -424,7 +424,7 @@ If no one is selected, default secret key is used.  "
     (let ((cte (save-restriction
 		 (narrow-to-region (point-min) (point))
 		 (mail-fetch-field "content-transfer-encoding"))))
-      ;; Strip MIME headers since it will be ASCII armoured.
+      ;; Strip MIME headers since it will be ASCII armored.
       (forward-line 1)
       (delete-region (point-min) (point))
       (when cte

lisp/gnus/smime.el

@@ -63,7 +63,7 @@
 ;;
 ;; Now you should be able to sign messages!  Create a buffer and write
 ;; something and run M-x smime-sign-buffer RET RET and you should see
-;; your message MIME armoured and a signature.  Encryption, M-x
+;; your message MIME armored and a signature.  Encryption, M-x
 ;; smime-encrypt-buffer, should also work.
 ;;
 ;; To be able to verify messages you need to build up trust with

lisp/hl-line.el

@@ -38,7 +38,7 @@
 ;; local mode behave like the global mode.
 
 ;; You probably don't really want to use the global mode; if the
-;; cursor is difficult to spot, try changing its colour, relying on
+;; cursor is difficult to spot, try changing its color, relying on
 ;; `blink-cursor-mode' or both.  The hookery used might affect
 ;; response noticeably on a slow machine.  The local mode may be
 ;; useful in non-editing buffers such as Gnus or PCL-CVS though.

lisp/mh-e/ChangeLog.1

@@ -10443,8 +10443,8 @@
 2001-12-04  Peter S Galbraith  <psg@debian.org>
 
 	* mh-e.el (mh-folder-subject-face et al.): Yet another attempt at
-	colours for folder-mode.  Still themed, but fewer and darker
-	colours (Blame Eric this time!).  I'll get to underlining tomorrow
+	colors for folder-mode.  Still themed, but fewer and darker
+	colors (Blame Eric this time!).  I'll get to underlining tomorrow
 	night.
 
 	* mh-e.el (mh-folder-tool-bar-map): Renamed all icons so they

lisp/org/org-table.el

@@ -1864,7 +1864,7 @@ For all numbers larger than LIMIT, shift them by DELTA."
 		     (string-match "^[a-zA-Z][a-zA-Z0-9]*$" field))
 	      (push (cons field v) org-table-local-parameters)
 	      (push (list field line col) org-table-named-field-locations))))
-      ;; Analyse the line types
+      ;; Analyze the line types
       (goto-char beg)
       (setq org-table-current-begin-line (org-current-line)
 	    org-table-current-begin-pos (point)

lisp/play/5x5.el

@@ -33,7 +33,7 @@
 ;; o The code for updating the grid needs to be re-done. At the moment it
 ;;   simply re-draws the grid every time a move is made.
 ;;
-;; o Look into tarting up the display with colour. gamegrid.el looks
+;; o Look into tarting up the display with color. gamegrid.el looks
 ;;   interesting, perhaps that is the way to go?
 
 ;;; Thanks:

lisp/progmodes/cc-awk.el

@@ -26,9 +26,9 @@
 
 ;; This file contains (most of) the adaptations to cc-mode required for the
 ;; integration of AWK Mode.
-;; It is organised thusly, the sections being separated by page breaks:
+;; It is organized thusly, the sections being separated by page breaks:
 ;;   1. The AWK Mode syntax table.
-;;   2. Regular expressions for analysing AWK code.
+;;   2. Regular expressions for analyzing AWK code.
 ;;   3. Indentation calculation stuff ("c-awk-NL-prop text-property").
 ;;   4. Syntax-table property/font-locking stuff, including the
 ;;      font-lock-keywords setting.
@@ -710,7 +710,7 @@
   ;;
   ;; ANCHOR-STATE-/DIV identifies whether a / at ANCHOR would have been a
   ;; division sign (value t) or a regexp opener (value nil).  The idea is that
-  ;; we analyse the line from ANCHOR up till point to determine what the / at
+  ;; we analyze the line from ANCHOR up till point to determine what the / at
   ;; point is.
   ;;
   ;; The result is what ANCHOR-STATE-/DIV (see above) is where point is left.

lisp/progmodes/sh-script.el

@@ -875,7 +875,7 @@ See `sh-feature'.")
   "Face to show a here-document"
   :group 'sh-indentation)
 
-;; These colours are probably icky.  It's just a placeholder though.
+;; These colors are probably icky.  It's just a placeholder though.
 (defface sh-quoted-exec
   '((((class color) (background dark))
      (:foreground "salmon"))

lisp/vc-hg.el

@@ -138,7 +138,7 @@
 ;;;###autoload         (load "vc-hg")
 ;;;###autoload         (vc-hg-registered file))))
 
-;; Modelled after the similar function in vc-bzr.el
+;; Modeled after the similar function in vc-bzr.el
 (defun vc-hg-registered (file)
   "Return non-nil if FILE is registered with hg."
   (when (vc-hg-root file)           ; short cut
@@ -272,7 +272,7 @@
       (split-string
        (buffer-substring-no-properties (point-min) (point-max))))))
 
-;; Modelled after the similar function in vc-cvs.el
+;; Modeled after the similar function in vc-cvs.el
 (defun vc-hg-revision-completion-table (files)
   (lexical-let ((files files)
                 table)
@@ -330,7 +330,7 @@ Optional arg REVISION is a revision to annotate from."
     (when (<= newrev tip-revision)
       (number-to-string newrev))))
 
-;; Modelled after the similar function in vc-bzr.el
+;; Modeled after the similar function in vc-bzr.el
 (defun vc-hg-delete-file (file)
   "Delete FILE and delete it in the hg repository."
   (condition-case ()
@@ -338,7 +338,7 @@ Optional arg REVISION is a revision to annotate from."
     (file-error nil))
   (vc-hg-command nil 0 file "remove" "--after" "--force"))
 
-;; Modelled after the similar function in vc-bzr.el
+;; Modeled after the similar function in vc-bzr.el
 (defun vc-hg-rename-file (old new)
   "Rename file from OLD to NEW using `hg mv'."
   (vc-hg-command nil 0 new "mv" old))
@@ -355,7 +355,7 @@ COMMENT is ignored."
 
 (defalias 'vc-hg-responsible-p 'vc-hg-root)
 
-;; Modelled after the similar function in vc-bzr.el
+;; Modeled after the similar function in vc-bzr.el
 (defun vc-hg-could-register (file)
   "Return non-nil if FILE could be registered under hg."
   (and (vc-hg-responsible-p file)      ; shortcut
@@ -383,7 +383,7 @@ REV is ignored."
 	(vc-hg-command buffer 0 file "cat" "-r" rev)
       (vc-hg-command buffer 0 file "cat"))))
 
-;; Modelled after the similar function in vc-bzr.el
+;; Modeled after the similar function in vc-bzr.el
 (defun vc-hg-checkout (file &optional editable rev)
   "Retrieve a revision of FILE.
 EDITABLE is ignored.
@@ -395,11 +395,11 @@ REV is the revision to check out into WORKFILE."
         (vc-hg-command t 0 file "cat" "-r" rev)
       (vc-hg-command t 0 file "cat")))))
 
-;; Modelled after the similar function in vc-bzr.el
+;; Modeled after the similar function in vc-bzr.el
 (defun vc-hg-workfile-unchanged-p (file)
   (eq 'up-to-date (vc-hg-state file)))
 
-;; Modelled after the similar function in vc-bzr.el
+;; Modeled after the similar function in vc-bzr.el
 (defun vc-hg-revert (file &optional contents-done)
   (unless contents-done
     (with-temp-buffer (vc-hg-command t 0 file "revert"))))

lisp/woman.el

@@ -2800,7 +2800,7 @@ Replaces || by |, but | by \, where | denotes the internal escape."
   "Process .de/am xx yy -- (re)define/append macro xx; end at `..'.
 \(Should be up to call of yy, which defaults to `.')
 Optional argument APPEND, if non-nil, means append macro."
-  ;; Modelled on woman-strings.  BEWARE: Processing of .am is a hack!
+  ;; Modeled on woman-strings.  BEWARE: Processing of .am is a hack!
   ;; Add support for .rm?
   ;; (skip-chars-forward " \t")
   (if (eolp)				; ignore if no argument

src/ChangeLog.2

@@ -2683,7 +2683,7 @@
 	* emacs.c,  dispnew.c:
 	Rename inhibit_x_windows inhibit_window_system.
 	Understand "-nw" command-line option.
-	Reorganise init_display a little to make other window-system
+	Reorganize init_display a little to make other window-system
 	code easier to accommodate.
 
 	* editfns.c (Fformat):

src/ChangeLog.5

@@ -4587,7 +4587,7 @@
 	(Fframep #2) [MSDOS]: Return 'pc for when termcap is not used.
 	(Fmouse_position #2) [HAVE_MOUSE]: Return useful information.
 	(Fframe_parameters #2): Show "font" as "default".
-	(Fframe_parameters #2) [MSDOS]: Show fore- and background colours.
+	(Fframe_parameters #2) [MSDOS]: Show fore- and background colors.
 	(Fmodify_frame_parameters #2) [MSDOS]: Call IT_set_frame_parameters.
 	(Fframe_list #2): New stub function.
 	(syms_of_frame #2): defsubr frame_list.
@@ -4671,7 +4671,7 @@
 	* sysdep.c (init_sys_modes): Make sure that internal_terminal_init
 	is only called once.
 	(init_sys_modes, reset_sys_modes) [HAVE_X_WINDOWS]: Add conditional.
-	(reset_sys_modes) [MSDOS]: Change to MSDOG's default colours.
+	(reset_sys_modes) [MSDOS]: Change to MSDOG's default colors.
 	(kbd_input_ast): Use just XSETFRAME.
 
 	* window.c (init_window_once) [!MULTI_FRAME]: Set selected_frame and
@@ -4691,7 +4691,7 @@
 	stubs.
 	(load_color) [MSDOS && !HAVE_X_WINDOWS]: Special version.
 	(Fset_face_attribute_internal) [MSDOS && !HAVE_X_WINDOWS]: Stubify
-	font setting, mask away 0x08 (the blink bit) from background colour.
+	font setting, mask away 0x08 (the blink bit) from background color.
 	(syms_of_xfaces) [!HAVE_X_WINDOWS]: Don't defsubr Spixmap_spec_p.
 	(Fmake_face_internal): Use FOR_EACH_FRAME.
 	(init_frame_faces): Guard multi-frame stuff with MULTI_FRAME.

src/ChangeLog.8

@@ -11455,9 +11455,8 @@
 
 1999-05-15  Andrew Innes  <andrewi@gnu.org>
 
-	* w32term.c (dumpglyphs): Use correct colours for drawing
-	rectangles in place of missing fonts, and make them the right
-	size.
+	* w32term.c (dumpglyphs): Use correct colors for drawing
+	rectangles in place of missing fonts, and make them the right size.
 
 1999-05-14  Dave Love  <fx@gnu.org>
 

src/gtkutil.c

@@ -1025,7 +1025,7 @@ x_wm_set_size_hint (f, flags, user_position)
 }
 
 /* Change background color of a frame.
-   Since GTK uses the background colour to clear the window, we must
+   Since GTK uses the background color to clear the window, we must
    keep the GTK and X colors in sync.
    F is the frame to change,
    BG is the pixel value to change to.  */

src/s/msdos.h

@@ -200,7 +200,7 @@ You lose; /* Emacs for DOS must be compiled with DJGPP */
 #define FLOAT_CHECK_DOMAIN
 
 /* When $TERM is "internal" then this is substituted:  */
-#define INTERNAL_TERMINAL "pc|bios|IBM PC with colour display:\
+#define INTERNAL_TERMINAL "pc|bios|IBM PC with color display:\
 :co#80:li#25:Co#16:pa#256:km:ms:cm=<CM>:cl=<CL>:ce=<CE>:\
 :se=</SO>:so=<SO>:us=<UL>:ue=</UL>:md=<BD>:mh=<DIM>:mb=<BL>:mr=<RV>:me=<NV>:\
 :AB=<BG %d>:AF=<FG %d>:op=<DefC>:"