Mercurial > emacs

changeset 96363:f9d35151b907

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
American English spelling fix.
author Glenn Morris <rgm@gnu.org>
date Fri, 27 Jun 2008 02:23:35 +0000
parents 572a12d1d2a7
children c5e50585b044
files etc/ChangeLog etc/NEWS.19 etc/TODO etc/termcap.src lisp/ChangeLog.6 lisp/ChangeLog.8 lisp/ChangeLog.9 lisp/erc/ChangeLog.03 lisp/erc/erc-capab.el lisp/font-lock.el lisp/gnus/ChangeLog.2 lisp/hl-line.el lisp/mh-e/ChangeLog.1 lisp/play/5x5.el lisp/progmodes/sh-script.el src/ChangeLog.5 src/ChangeLog.8 src/gtkutil.c src/s/msdos.h
diffstat 19 files changed, 39 insertions(+), 40 deletions(-) [+]
line wrap: on
line diff
--- a/etc/ChangeLog	Fri Jun 27 02:14:52 2008 +0000
+++ b/etc/ChangeLog	Fri Jun 27 02:23:35 2008 +0000
@@ -1880,7 +1880,7 @@
 
 2005-10-25  Nick Roberts  <nickrob@snap.net.nz>
 
-	* images/gud/until.xpm: Colour correction.
+	* images/gud/until.xpm: Color correction.
 
 2005-10-23  Richard M. Stallman  <rms@gnu.org>
 
@@ -2728,7 +2728,7 @@
 
 2003-04-01  Dave Love  <fx@gnu.org>
 
-	* letter.xpm: Use transparent/opaque `colours'.
+	* letter.xpm: Use transparent/opaque `colors'.
 
 	* letter.xbm: Deleted.
 
--- a/etc/NEWS.19	Fri Jun 27 02:14:52 2008 +0000
+++ b/etc/NEWS.19	Fri Jun 27 02:23:35 2008 +0000
@@ -1953,7 +1953,7 @@
 window system is used.  Two new user options Man-overstrike-face
 (default 'bold) and Man-underline-face (default 'underline) can be set
 to the preferred faces to be used for the words that man overstrikes
-and underlines.  Useful for those who like coloured man pages.
+and underlines.  Useful for those who like colored man pages.
 
 Two new interactive functions are provided: Man-cleanup-manpage and
 Man-fontify-manpage.  Both can be used on a buffer that contains the
--- a/etc/TODO	Fri Jun 27 02:14:52 2008 +0000
+++ b/etc/TODO	Fri Jun 27 02:23:35 2008 +0000
@@ -526,8 +526,8 @@
   probably in separate manual.
 
 ** Convert the XPM bitmaps to PPM, replace the PBMs with them and scrap
-  the XPMs so that the colour versions work generally.  (Requires care
-  with the colour used for the transparent regions.)
+  the XPMs so that the color versions work generally.  (Requires care
+  with the color used for the transparent regions.)
 
 ** Convenient access to the `values' variable.  It would be nice to have an
   interface that would show you the printed reps of the elements of the
--- a/etc/termcap.src	Fri Jun 27 02:14:52 2008 +0000
+++ b/etc/termcap.src	Fri Jun 27 02:23:35 2008 +0000
@@ -1257,7 +1257,7 @@
 	:co#132:li#50:\
 	:is=\E[1;50r\E[50;1H:tc=pcvtXX:
 
-# Terminfo entries to enable the use of the ncurses library in colour on a
+# Terminfo entries to enable the use of the ncurses library in color on a
 # NetBSD-arm32 console (only tested on a RiscPC).
 # Created by Dave Millen <dmill@globalnet.co.uk> 22.07.98
 # modified codes for setf/setb to setaf/setab, then to klone+color, corrected
@@ -4973,7 +4973,7 @@
 #     U  send ^J
 #     D  send ^V
 #
-# S2  7  Screen colour
+# S2  7  Screen color
 #     U  green on black
 #     D  black on green
 #
@@ -5024,7 +5024,7 @@
 # S2  4  Edit mode           (U = local, D = duplex)
 # S2  5  Cursor type         (U = underline, D = block)
 # S2  6  Cursor down key     (U = send ^J, D = send ^V)
-# S2  7  Screen colour       (U = green on black, D = black on green)
+# S2  7  Screen color       (U = green on black, D = black on green)
 # S2  8  DSR status (pin 6)  (U = disconnected, D = connected)
 # S2  9  DCD status (pin 8)  (U = disconnected, D = connected)
 # S2 10  DTR status (pin 20) (U = disconnected, D = connected)
@@ -11023,7 +11023,7 @@
 #ESC D F         set full duplex
 #ESC D H         set half duplex
 #ESC E           line insert
-#ESC F p1 p2     set page colour (p1 = f/grnd, p2 = b/grnd)
+#ESC F p1 p2     set page color (p1 = f/grnd, p2 = b/grnd)
 #                0 = black, 1 = red,     2 = green, 3 = yellow
 #                4 = blue,  5 = magenta, 6 = cyan,  7 = white
 #ESC G n         set serial field attribute (n = 30h - 3Fh)
@@ -11090,8 +11090,8 @@
 #                    = = reverse underline blank
 #                    > = reverse underline blink
 #                    ? = reverse underline blink blank
-#                p2, p3: f/grnd, b/grnd colour
-#                (see ESC F for colours)
+#                p2, p3: f/grnd, b/grnd color
+#                (see ESC F for colors)
 #                use ZZ for mono, eg.
 #                    ESC [ 0 Z Z for normal
 #                    ESC [ 4 Z Z for inverse etc.
@@ -11105,7 +11105,7 @@
 #                n = 0   normal (KDS7372) mode
 #                n = 1   Wordstar mode
 #
-#ESC b           set foreground colour screen
+#ESC b           set foreground color screen
 #
 #ESC c n         enter self-test mode:
 #                n = 0   exit self test mode
@@ -11119,7 +11119,7 @@
 #                n = 8   graphics memory test
 #                n = 9   display all 'E'
 #                n = :   display all 'H'
-#ESC d           set background colour screen
+#ESC d           set background color screen
 #
 #ESC e n         program insert char (n = insert char)
 #ESC f text CR   load user status line with 'text'
@@ -12282,7 +12282,7 @@
 	:k7=\E!^G:k8=\E!^H:k9=\E!^I:k;=\E!^J:kb=^H:kd=\E!U:kh=\E!S:\
 	:kl=\E!V:kr=\E!W:ku=\E!T:le=\ED:ll=\ES7\s:nd=\EC:sf=^J:\
 	:sr=\ER:up=\EA:
-pe7000c|perkin elmer 7000 series colour monitor:\
+pe7000c|perkin elmer 7000 series color monitor:\
 	:i1=\E!\0\EW  7o\Egf\Eb0\Ec7\ES7\s:se=\Eb0:so=\Eb2:\
 	:ue=\E!\0:us=\E!\s:tc=pe7000m:
 
@@ -13981,7 +13981,7 @@
 # Mikrocomputer GmbH" in Munster, Germany (the company still exists today,
 # about 1,5 km from where I live, but doesn't build own computers any
 # more). A Basis 108 featured a really heavy (cast aluminum?) case, was
-# equipped with one or two 5.25" disk drives, had a monochrome and colour
+# equipped with one or two 5.25" disk drives, had a monochrome and color
 # video output for a TV set or a dedicated monitor and several slots for
 # Apple II cards. Basis 108 were quite popular at german schools before
 # the advent of the IBM PC. They run, for example, the UCSD Pascal
@@ -14219,7 +14219,7 @@
 #	Typical firmware identification F5 "etat 6":
 #  P287.02.04b	(AZERTY)
 #  P297.11.04	(24-pin: 2732)	or P798.11.04	(28-pin: 2764)
-#  P298.03.03	(monochrome)	or P374.03.02	(colour)
+#  P298.03.03	(monochrome)	or P374.03.02	(color)
 #
 #	SM SDP mode (VIP command):	^[[?=h
 #	RIS (erases screen):		^[c
@@ -14289,7 +14289,7 @@
 	:AL@:DL@:al@:ce=\E[K\E[m:cl=\E[2J\E[H:cm@:dl@:\
 	:ds=\EPY99\:98\E\\\E[0;98v\E[2J\E[H\E[v:\
 	:ts=\EPY99\:98\E\\\E[0;98v\E[H\E[2;7m:tc=tws-generic:
-dku7202|BULL Questar 200 DKU7202 (colour/character attributes):\
+dku7202|BULL Questar 200 DKU7202 (color/character attributes):\
 	:i2=\E[?3h\Eb:mb=\E[0;2;4m:mh=\E[0;5m:so=\E[0;4;5;7m:\
 	:ta=^I:us=\E[0;2m:tc=tws-generic:
 
--- a/lisp/ChangeLog.6	Fri Jun 27 02:14:52 2008 +0000
+++ b/lisp/ChangeLog.6	Fri Jun 27 02:23:35 2008 +0000
@@ -4591,7 +4591,7 @@
 1995-12-13  Simon Marshall  <simon@duality.gnu.ai.mit.edu>
 
 	* faces.el (modify-face): Take extra optional arg FRAME.
-	Use face-try-color-list to change foreground and background colours.
+	Use face-try-color-list to change foreground and background colors.
 	If BOLD-P, ITALIC-P or UNDERLINE-P not nil or t, don't change the
 	display attribute corresponding to that arg.  Doc fix.
 
--- a/lisp/ChangeLog.8	Fri Jun 27 02:14:52 2008 +0000
+++ b/lisp/ChangeLog.8	Fri Jun 27 02:23:35 2008 +0000
@@ -3881,7 +3881,7 @@
 	(frame-delete-all): Moved to subr.el as `assoc-delete-all'.
 	Callers changed.
 	(set-background-color, set-foreground-color, set-cursor-color)
-	(set-mouse-color, set-border-color): Offer completion of colours.
+	(set-mouse-color, set-border-color): Offer completion of colors.
 	(cursor): Add :version to defgroup.
 
 	* facemenu.el (list-colors-display): Make it work on ttys.
--- a/lisp/ChangeLog.9	Fri Jun 27 02:14:52 2008 +0000
+++ b/lisp/ChangeLog.9	Fri Jun 27 02:23:35 2008 +0000
@@ -10523,7 +10523,7 @@
 	* toolbar/open.xpm, toolbar/undo.xpm, toolbar/home.xpm:
 	* toolbar/paste.xpm, toolbar/up_arrow.xpm, toolbar/index.xpm:
 	* toolbar/preferences.xpm, toolbar/info.xpm, toolbar/print.xpm:
-	Reduce colour requirements to 25 overall.  (Probably wants
+	Reduce color requirements to 25 overall.  (Probably wants
 	revisiting from the originals to reduce further.)
 
 2000-10-11  Eli Zaretskii  <eliz@is.elta.co.il>
--- a/lisp/erc/ChangeLog.03	Fri Jun 27 02:14:52 2008 +0000
+++ b/lisp/erc/ChangeLog.03	Fri Jun 27 02:23:35 2008 +0000
@@ -1474,7 +1474,7 @@
 
 	* erc.el 1.441:
 	erc-error-face: setting a background doesn't work so well with multi-line
-	    messages, so we don't. fg colour is negotiable ;-)
+	    messages, so we don't. fg color is negotiable ;-)
 	(erc-cmd-QUERY): fixed, new doco, supress (erc-delete-query) until we fix it
 	(erc-send-current-line): allow multi-line messages provided they don't start
 	    with a slash - there's no need to prohibit them if the slash isn't the
--- a/lisp/erc/erc-capab.el	Fri Jun 27 02:14:52 2008 +0000
+++ b/lisp/erc/erc-capab.el	Fri Jun 27 02:23:35 2008 +0000
@@ -43,7 +43,7 @@
 ;; From freenode.net's web site (not there anymore) on how to mark
 ;; unidentified users:
 ;; "We recommend that you add an asterisk before the nick, and
-;;  optionally either highlight or colourize the line in some
+;;  optionally either highlight or colorize the line in some
 ;;  appropriate fashion, if the user is not identified."
 
 ;;; Usage:
--- a/lisp/font-lock.el	Fri Jun 27 02:14:52 2008 +0000
+++ b/lisp/font-lock.el	Fri Jun 27 02:23:35 2008 +0000
@@ -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 @@
 	(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 @@
   "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.
 
--- a/lisp/gnus/ChangeLog.2	Fri Jun 27 02:14:52 2008 +0000
+++ b/lisp/gnus/ChangeLog.2	Fri Jun 27 02:23:35 2008 +0000
@@ -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>
 
--- a/lisp/hl-line.el	Fri Jun 27 02:14:52 2008 +0000
+++ b/lisp/hl-line.el	Fri Jun 27 02:23:35 2008 +0000
@@ -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.
--- a/lisp/mh-e/ChangeLog.1	Fri Jun 27 02:14:52 2008 +0000
+++ b/lisp/mh-e/ChangeLog.1	Fri Jun 27 02:23:35 2008 +0000
@@ -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
--- a/lisp/play/5x5.el	Fri Jun 27 02:14:52 2008 +0000
+++ b/lisp/play/5x5.el	Fri Jun 27 02:23:35 2008 +0000
@@ -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:
--- a/lisp/progmodes/sh-script.el	Fri Jun 27 02:14:52 2008 +0000
+++ b/lisp/progmodes/sh-script.el	Fri Jun 27 02:23:35 2008 +0000
@@ -875,7 +875,7 @@
   "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"))
--- a/src/ChangeLog.5	Fri Jun 27 02:14:52 2008 +0000
+++ b/src/ChangeLog.5	Fri Jun 27 02:23:35 2008 +0000
@@ -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.
--- a/src/ChangeLog.8	Fri Jun 27 02:14:52 2008 +0000
+++ b/src/ChangeLog.8	Fri Jun 27 02:23:35 2008 +0000
@@ -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>
 
--- a/src/gtkutil.c	Fri Jun 27 02:14:52 2008 +0000
+++ b/src/gtkutil.c	Fri Jun 27 02:23:35 2008 +0000
@@ -1025,7 +1025,7 @@
 }
 
 /* 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.  */
--- a/src/s/msdos.h	Fri Jun 27 02:14:52 2008 +0000
+++ b/src/s/msdos.h	Fri Jun 27 02:23:35 2008 +0000
@@ -200,7 +200,7 @@
 #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>:"