summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2008-06-27 02:41:14 +0000
committerGlenn Morris <rgm@gnu.org>2008-06-27 02:41:14 +0000
commit6772c8e169a6a56ee387373a00a65bd3a3070725 (patch)
tree4f0d9a8f0be905ba92b3420ad2832ffaad05a3b2 /src
parent04bf5b655a9b5c0b82d8f54f96ab0f90241f6ab8 (diff)
downloademacs-6772c8e169a6a56ee387373a00a65bd3a3070725.tar.gz
American English spelling fix.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog.22
-rw-r--r--src/ChangeLog.56
-rw-r--r--src/ChangeLog.85
-rw-r--r--src/gtkutil.c2
-rw-r--r--src/s/msdos.h2
5 files changed, 8 insertions, 9 deletions
diff --git a/src/ChangeLog.2 b/src/ChangeLog.2
index 72dd7a89e46..8165842f616 100644
--- a/src/ChangeLog.2
+++ b/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):
diff --git a/src/ChangeLog.5 b/src/ChangeLog.5
index 8b003decef0..dd4ba75089d 100644
--- a/src/ChangeLog.5
+++ b/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.
diff --git a/src/ChangeLog.8 b/src/ChangeLog.8
index 5e12b506a36..49d6f09257c 100644
--- a/src/ChangeLog.8
+++ b/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>
diff --git a/src/gtkutil.c b/src/gtkutil.c
index fb766c445a4..996d3f49892 100644
--- a/src/gtkutil.c
+++ b/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. */
diff --git a/src/s/msdos.h b/src/s/msdos.h
index ea940e5383c..73e62ecad6c 100644
--- a/src/s/msdos.h
+++ b/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>:"