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.

diff --git a/ChangeLog b/ChangeLog
index 69945b96c23a7d68b63e3964ffd77f63e7f69dc7..b7b2ce9a22fe1f8d3afa7b7909433d44879b70a3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-08-07  Reuben Thomas  <rrt@sc3d.org>
+
+       * README: ``MSDOG'' becomes ``MS-DOS''.
+
 2014-08-04  Paul Eggert  <eggert@cs.ucla.edu>
 
        Merge from gnulib, incorporating:

diff --git a/README b/README
index 9f0ff0c5daac11f00dd6b94b088f5029db28f46d..daf7b0dbfdadf85af87b748f605f1c804c43b48e 100644 (file)
--- a/README
+++ b/README
@@ -84,7 +84,7 @@ There are several subdirectories:
 `doc/lispref'   holds the source code for the Emacs Lisp reference manual.
 `doc/lispintro' holds the source code for the Introduction to Programming
                 in Emacs Lisp manual.
-`msdos'     holds configuration files for compiling Emacs under MSDOG.
+`msdos'     holds configuration files for compiling Emacs under MS-DOS.
 `nextstep'  holds instructions and some other files for compiling the
             Nextstep port of Emacs, for GNUstep and Mac OS X Cocoa.
 `nt'        holds various command files and documentation files that pertain

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7c529d1f0d3ffc6d77c6ea98921f55f5ac72502a..9948ec0d3c0de2752ab92dd2856c4c8112287487 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2014-08-07  Reuben Thomas  <rrt@sc3d.org>
+
+       Refer to MS-DOS using the same name everywhere.
+
+       * arc-mode.el: Fix a couple of ``MS-DOG''s missed in the previous
+       commit.
+       * file-mode.el: ditto.
+
 2014-08-07  Reuben Thomas  <rrt@sc3d.org>
 
        Refer to MS-DOS using the same name everywhere.

diff --git a/lisp/arc-mode.el b/lisp/arc-mode.el
index f1bdbf1a325dfb2bb5002a71d31a214aa83a3f0b..ef155ee2b99c02ec8afabcc548e92dc0a58a9160 100644 (file)
--- a/lisp/arc-mode.el
+++ b/lisp/arc-mode.el
@@ -31,7 +31,7 @@
 ;; understand the directory level of the archives.  For this reason,
 ;; you should expect this code to need more fiddling than tar-mode.el
 ;; (although it at present has fewer bugs :-)  In particular, I have
-;; not tested this under Ms-Dog myself.
+;; not tested this under MS-DOS myself.
 ;; -------------------------------------
 ;; INTERACTION: arc-mode.el should play together with
 ;;

diff --git a/lisp/files.el b/lisp/files.el
index 9272e98384fc1248741de47799156f2cfb3d9e90..597afb99120c68c23aab27802cb66f97b26ffbb0 100644 (file)
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -2412,11 +2412,10 @@ ARC\\|ZIP\\|LZH\\|LHA\\|ZOO\\|[JEW]AR\\|XPI\\|RAR\\|7Z\\)\\'" . archive-mode)
      ("\\.by\\'" . bovine-grammar-mode)
      ("\\.wy\\'" . wisent-grammar-mode)
      ;; .emacs or .gnus or .viper following a directory delimiter in
-     ;; Unix, MSDOG or VMS syntax.
+     ;; Unix or MS-DOS syntax.
      ("[]>:/\\]\\..*\\(emacs\\|gnus\\|viper\\)\\'" . emacs-lisp-mode)
      ("\\`\\..*emacs\\'" . emacs-lisp-mode)
-     ;; _emacs following a directory delimiter
-     ;; in MsDos syntax
+     ;; _emacs following a directory delimiter in MS-DOS syntax
      ("[:/]_emacs\\'" . emacs-lisp-mode)
      ("/crontab\\.X*[0-9]+\\'" . shell-script-mode)
      ("\\.ml\\'" . lisp-mode)
@@ -2439,7 +2438,7 @@ ARC\\|ZIP\\|LZH\\|LHA\\|ZOO\\|[JEW]AR\\|XPI\\|RAR\\|7Z\\)\\'" . archive-mode)
      ("\\.\\(asn\\|mib\\|smi\\)\\'" . snmp-mode)
      ("\\.\\(as\\|mi\\|sm\\)2\\'" . snmpv2-mode)
      ("\\.\\(diffs?\\|patch\\|rej\\)\\'" . diff-mode)
-     ("\\.\\(dif\\|pat\\)\\'" . diff-mode) ; for MSDOG
+     ("\\.\\(dif\\|pat\\)\\'" . diff-mode) ; for MS-DOS
      ("\\.[eE]?[pP][sS]\\'" . ps-mode)
      ("\\.\\(?:PDF\\|DVI\\|OD[FGPST]\\|DOCX?\\|XLSX?\\|PPTX?\\|pdf\\|djvu\\|dvi\\|od[fgpst]\\|docx?\\|xlsx?\\|pptx?\\)\\'" . doc-view-mode-maybe)
      ("configure\\.\\(ac\\|in\\)\\'" . autoconf-mode)

diff --git a/src/ChangeLog b/src/ChangeLog
index a5560f09e0fdd47ad4bb81ceac0a8ce57e2bcc37..9369ee25cca48a737f7264b726d797fd163fe281 100644 (file)
--- 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 f779bb9ebb6b447557b5073dba6d7dd5f144b1d9..a906aead09a7a7541df0da03353e12446117c5b9 100644 (file)
--- 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 34895123db9896481219cd7cf44cd1b23e7a6afb..047f75ffb19bad0630997e644d83c9a532c0a0a2 100644 (file)
--- 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);