diff options
| author | Reuben Thomas | 2014-08-07 11:15:52 +0100 |
|---|---|---|
| committer | Reuben Thomas | 2014-08-07 11:15:52 +0100 |
| commit | 6c5bbf8a00919b191d5319ee9324c93f1c496dbf (patch) | |
| tree | 8e23368e50cbc3116ed00d9f3a22d0bb377b367b /src | |
| parent | df514ccf9b9e6a4a3864d57c92425b7d7de1fd7b (diff) | |
| download | emacs-6c5bbf8a00919b191d5319ee9324c93f1c496dbf.tar.gz emacs-6c5bbf8a00919b191d5319ee9324c93f1c496dbf.zip | |
Fix a few ``MS-DOG''s overlooked in the previous commit.
* README: ``MSDOG'' becomes ``MS-DOS''.
* lisp/arc-mode.el: Fix a couple of ``MS-DOG''s missed in the previous
commit.
* lisp/file-mode.el: ditto.
* src/editfns.c: Fix a couple of ``MS-DOG''s missed in the previous commit.
* src/xfaces.c: ditto.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 8 | ||||
| -rw-r--r-- | src/editfns.c | 2 | ||||
| -rw-r--r-- | src/xfaces.c | 2 |
3 files changed, 10 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index a5560f09e0f..9369ee25cca 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,11 @@ | |||
| 1 | 2014-08-07 Reuben Thomas <rrt@sc3d.org> | ||
| 2 | |||
| 3 | Refer to MS-DOS using the same name everywhere. | ||
| 4 | |||
| 5 | * editfns.c: Fix a couple of ``MS-DOG''s missed in the previous | ||
| 6 | commit. | ||
| 7 | * xfaces.c: ditto. | ||
| 8 | |||
| 1 | 2014-08-05 Martin Rudalics <rudalics@gmx.at> | 9 | 2014-08-05 Martin Rudalics <rudalics@gmx.at> |
| 2 | 10 | ||
| 3 | * w32term.c (w32_redeem_scroll_bar): | 11 | * w32term.c (w32_redeem_scroll_bar): |
diff --git a/src/editfns.c b/src/editfns.c index f779bb9ebb6..a906aead09a 100644 --- a/src/editfns.c +++ b/src/editfns.c | |||
| @@ -112,7 +112,7 @@ init_editfns (void) | |||
| 112 | pw = getpwuid (getuid ()); | 112 | pw = getpwuid (getuid ()); |
| 113 | #ifdef MSDOS | 113 | #ifdef MSDOS |
| 114 | /* We let the real user name default to "root" because that's quite | 114 | /* We let the real user name default to "root" because that's quite |
| 115 | accurate on MSDOG and because it lets Emacs find the init file. | 115 | accurate on MS-DOS and because it lets Emacs find the init file. |
| 116 | (The DVX libraries override the Djgpp libraries here.) */ | 116 | (The DVX libraries override the Djgpp libraries here.) */ |
| 117 | Vuser_real_login_name = build_string (pw ? pw->pw_name : "root"); | 117 | Vuser_real_login_name = build_string (pw ? pw->pw_name : "root"); |
| 118 | #else | 118 | #else |
diff --git a/src/xfaces.c b/src/xfaces.c index 34895123db9..047f75ffb19 100644 --- a/src/xfaces.c +++ b/src/xfaces.c | |||
| @@ -1068,7 +1068,7 @@ tty_color_name (struct frame *f, int idx) | |||
| 1068 | return XCAR (coldesc); | 1068 | return XCAR (coldesc); |
| 1069 | } | 1069 | } |
| 1070 | #ifdef MSDOS | 1070 | #ifdef MSDOS |
| 1071 | /* We can have an MSDOG frame under -nw for a short window of | 1071 | /* We can have an MS-DOS frame under -nw for a short window of |
| 1072 | opportunity before internal_terminal_init is called. DTRT. */ | 1072 | opportunity before internal_terminal_init is called. DTRT. */ |
| 1073 | if (FRAME_MSDOS_P (f) && !inhibit_window_system) | 1073 | if (FRAME_MSDOS_P (f) && !inhibit_window_system) |
| 1074 | return msdos_stdcolor_name (idx); | 1074 | return msdos_stdcolor_name (idx); |