diff options
| author | Glenn Morris | 2008-06-27 02:41:14 +0000 |
|---|---|---|
| committer | Glenn Morris | 2008-06-27 02:41:14 +0000 |
| commit | 6772c8e169a6a56ee387373a00a65bd3a3070725 (patch) | |
| tree | 4f0d9a8f0be905ba92b3420ad2832ffaad05a3b2 /src | |
| parent | 04bf5b655a9b5c0b82d8f54f96ab0f90241f6ab8 (diff) | |
| download | emacs-6772c8e169a6a56ee387373a00a65bd3a3070725.tar.gz emacs-6772c8e169a6a56ee387373a00a65bd3a3070725.zip | |
American English spelling fix.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog.2 | 2 | ||||
| -rw-r--r-- | src/ChangeLog.5 | 6 | ||||
| -rw-r--r-- | src/ChangeLog.8 | 5 | ||||
| -rw-r--r-- | src/gtkutil.c | 2 | ||||
| -rw-r--r-- | src/s/msdos.h | 2 |
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 @@ | |||
| 2683 | * emacs.c, dispnew.c: | 2683 | * emacs.c, dispnew.c: |
| 2684 | Rename inhibit_x_windows inhibit_window_system. | 2684 | Rename inhibit_x_windows inhibit_window_system. |
| 2685 | Understand "-nw" command-line option. | 2685 | Understand "-nw" command-line option. |
| 2686 | Reorganise init_display a little to make other window-system | 2686 | Reorganize init_display a little to make other window-system |
| 2687 | code easier to accommodate. | 2687 | code easier to accommodate. |
| 2688 | 2688 | ||
| 2689 | * editfns.c (Fformat): | 2689 | * 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 @@ | |||
| 4587 | (Fframep #2) [MSDOS]: Return 'pc for when termcap is not used. | 4587 | (Fframep #2) [MSDOS]: Return 'pc for when termcap is not used. |
| 4588 | (Fmouse_position #2) [HAVE_MOUSE]: Return useful information. | 4588 | (Fmouse_position #2) [HAVE_MOUSE]: Return useful information. |
| 4589 | (Fframe_parameters #2): Show "font" as "default". | 4589 | (Fframe_parameters #2): Show "font" as "default". |
| 4590 | (Fframe_parameters #2) [MSDOS]: Show fore- and background colours. | 4590 | (Fframe_parameters #2) [MSDOS]: Show fore- and background colors. |
| 4591 | (Fmodify_frame_parameters #2) [MSDOS]: Call IT_set_frame_parameters. | 4591 | (Fmodify_frame_parameters #2) [MSDOS]: Call IT_set_frame_parameters. |
| 4592 | (Fframe_list #2): New stub function. | 4592 | (Fframe_list #2): New stub function. |
| 4593 | (syms_of_frame #2): defsubr frame_list. | 4593 | (syms_of_frame #2): defsubr frame_list. |
| @@ -4671,7 +4671,7 @@ | |||
| 4671 | * sysdep.c (init_sys_modes): Make sure that internal_terminal_init | 4671 | * sysdep.c (init_sys_modes): Make sure that internal_terminal_init |
| 4672 | is only called once. | 4672 | is only called once. |
| 4673 | (init_sys_modes, reset_sys_modes) [HAVE_X_WINDOWS]: Add conditional. | 4673 | (init_sys_modes, reset_sys_modes) [HAVE_X_WINDOWS]: Add conditional. |
| 4674 | (reset_sys_modes) [MSDOS]: Change to MSDOG's default colours. | 4674 | (reset_sys_modes) [MSDOS]: Change to MSDOG's default colors. |
| 4675 | (kbd_input_ast): Use just XSETFRAME. | 4675 | (kbd_input_ast): Use just XSETFRAME. |
| 4676 | 4676 | ||
| 4677 | * window.c (init_window_once) [!MULTI_FRAME]: Set selected_frame and | 4677 | * window.c (init_window_once) [!MULTI_FRAME]: Set selected_frame and |
| @@ -4691,7 +4691,7 @@ | |||
| 4691 | stubs. | 4691 | stubs. |
| 4692 | (load_color) [MSDOS && !HAVE_X_WINDOWS]: Special version. | 4692 | (load_color) [MSDOS && !HAVE_X_WINDOWS]: Special version. |
| 4693 | (Fset_face_attribute_internal) [MSDOS && !HAVE_X_WINDOWS]: Stubify | 4693 | (Fset_face_attribute_internal) [MSDOS && !HAVE_X_WINDOWS]: Stubify |
| 4694 | font setting, mask away 0x08 (the blink bit) from background colour. | 4694 | font setting, mask away 0x08 (the blink bit) from background color. |
| 4695 | (syms_of_xfaces) [!HAVE_X_WINDOWS]: Don't defsubr Spixmap_spec_p. | 4695 | (syms_of_xfaces) [!HAVE_X_WINDOWS]: Don't defsubr Spixmap_spec_p. |
| 4696 | (Fmake_face_internal): Use FOR_EACH_FRAME. | 4696 | (Fmake_face_internal): Use FOR_EACH_FRAME. |
| 4697 | (init_frame_faces): Guard multi-frame stuff with MULTI_FRAME. | 4697 | (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 @@ | |||
| 11455 | 11455 | ||
| 11456 | 1999-05-15 Andrew Innes <andrewi@gnu.org> | 11456 | 1999-05-15 Andrew Innes <andrewi@gnu.org> |
| 11457 | 11457 | ||
| 11458 | * w32term.c (dumpglyphs): Use correct colours for drawing | 11458 | * w32term.c (dumpglyphs): Use correct colors for drawing |
| 11459 | rectangles in place of missing fonts, and make them the right | 11459 | rectangles in place of missing fonts, and make them the right size. |
| 11460 | size. | ||
| 11461 | 11460 | ||
| 11462 | 1999-05-14 Dave Love <fx@gnu.org> | 11461 | 1999-05-14 Dave Love <fx@gnu.org> |
| 11463 | 11462 | ||
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) | |||
| 1025 | } | 1025 | } |
| 1026 | 1026 | ||
| 1027 | /* Change background color of a frame. | 1027 | /* Change background color of a frame. |
| 1028 | Since GTK uses the background colour to clear the window, we must | 1028 | Since GTK uses the background color to clear the window, we must |
| 1029 | keep the GTK and X colors in sync. | 1029 | keep the GTK and X colors in sync. |
| 1030 | F is the frame to change, | 1030 | F is the frame to change, |
| 1031 | BG is the pixel value to change to. */ | 1031 | 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 */ | |||
| 200 | #define FLOAT_CHECK_DOMAIN | 200 | #define FLOAT_CHECK_DOMAIN |
| 201 | 201 | ||
| 202 | /* When $TERM is "internal" then this is substituted: */ | 202 | /* When $TERM is "internal" then this is substituted: */ |
| 203 | #define INTERNAL_TERMINAL "pc|bios|IBM PC with colour display:\ | 203 | #define INTERNAL_TERMINAL "pc|bios|IBM PC with color display:\ |
| 204 | :co#80:li#25:Co#16:pa#256:km:ms:cm=<CM>:cl=<CL>:ce=<CE>:\ | 204 | :co#80:li#25:Co#16:pa#256:km:ms:cm=<CM>:cl=<CL>:ce=<CE>:\ |
| 205 | :se=</SO>:so=<SO>:us=<UL>:ue=</UL>:md=<BD>:mh=<DIM>:mb=<BL>:mr=<RV>:me=<NV>:\ | 205 | :se=</SO>:so=<SO>:us=<UL>:ue=</UL>:md=<BD>:mh=<DIM>:mb=<BL>:mr=<RV>:me=<NV>:\ |
| 206 | :AB=<BG %d>:AF=<FG %d>:op=<DefC>:" | 206 | :AB=<BG %d>:AF=<FG %d>:op=<DefC>:" |