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 @@
+2014-08-07  Reuben Thomas  <rrt@sc3d.org>
+
+        Refer to MS-DOS using the same name everywhere.
+
+        * editfns.c: Fix a couple of ``MS-DOG''s missed in the previous
+        commit.
+        * xfaces.c: ditto.
+
 2014-08-05  Martin Rudalics  <rudalics@gmx.at>
 
         * 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)
   pw = getpwuid (getuid ());
 #ifdef MSDOS
   /* We let the real user name default to "root" because that's quite
-     accurate on MSDOG and because it lets Emacs find the init file.
+     accurate on MS-DOS and because it lets Emacs find the init file.
      (The DVX libraries override the Djgpp libraries here.)  */
   Vuser_real_login_name = build_string (pw ? pw->pw_name : "root");
 #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)
         return XCAR (coldesc);
     }
 #ifdef MSDOS
-  /* We can have an MSDOG frame under -nw for a short window of
+  /* We can have an MS-DOS frame under -nw for a short window of
      opportunity before internal_terminal_init is called.  DTRT.  */
   if (FRAME_MSDOS_P (f) && !inhibit_window_system)
     return msdos_stdcolor_name (idx);