[Emacs-diffs] trunk r117661: Refer to MS-DOS using the same name everywhere.

[Reuben Thomas]

------------------------------------------------------------
revno: 117661
revision-id: address@hidden
parent: address@hidden
committer: Reuben Thomas <address@hidden>
branch nick: trunk
timestamp: Thu 2014-08-07 10:55:09 +0100
message:
  Refer to MS-DOS using the same name everywhere.
  
  * admin/FOR-RELEASE: ``MS-DOG'', ``MSDOG'' and ``msdog'' become
  ``MS-DOS''; ``msdog'' in filenames becomes ``msdos''.
  * admin/MAINTAINERS: ditto.
  * doc/emacs/Makefile.in (EMACSSOURCES): ditto.
  * doc/emacs/emacs-xtra.texi: ditto.
  * doc/emacs/emacs.texi: ditto.
  * doc/emacs/makefile.w32-in: ditto.
  * doc/emacs/msdog-xtra.texi: ditto, and rename file.
  * doc/emacs/msdog.texi: ditto, and rename file.
  * lisp/arc-mode.el: ditto.
  * lisp/frame.el: ditto.
renamed:
  doc/emacs/msdog-xtra.texi => doc/emacs/msdos-xtra.texi 
msdogxtra.texi-20091113204419-o5vbwnq5f7feedwu-6268
  doc/emacs/msdog.texi => doc/emacs/msdos.texi 
msdog.texi-20091113204419-o5vbwnq5f7feedwu-6269
modified:
  admin/ChangeLog                changelog-20091113204419-o5vbwnq5f7feedwu-2226
  admin/FOR-RELEASE              forrelease-20091113204419-o5vbwnq5f7feedwu-3115
  admin/MAINTAINERS              
maintainers-20091113204419-o5vbwnq5f7feedwu-7526
  doc/emacs/ChangeLog            changelog-20091113204419-o5vbwnq5f7feedwu-6227
  doc/emacs/Makefile.in          
makefile.in-20091113204419-o5vbwnq5f7feedwu-6228
  doc/emacs/emacs-xtra.texi      
emacsxtra.texi-20091113204419-o5vbwnq5f7feedwu-6245
  doc/emacs/emacs.texi           emacs.texi-20091113204419-o5vbwnq5f7feedwu-6246
  doc/emacs/makefile.w32-in      
makefile.w32in-20091113204419-o5vbwnq5f7feedwu-6264
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/arc-mode.el               arcmode.el-20091113204419-o5vbwnq5f7feedwu-877
  lisp/frame.el                  frame.el-20091113204419-o5vbwnq5f7feedwu-275
  doc/emacs/msdos-xtra.texi      
msdogxtra.texi-20091113204419-o5vbwnq5f7feedwu-6268
  doc/emacs/msdos.texi           msdog.texi-20091113204419-o5vbwnq5f7feedwu-6269

=== modified file 'admin/ChangeLog'
--- a/admin/ChangeLog   2014-07-14 19:23:18 +0000
+++ b/admin/ChangeLog   2014-08-07 09:55:09 +0000
@@ -1,3 +1,11 @@
+2014-08-07  Reuben Thomas  <address@hidden>
+
+       Refer to MS-DOS using the same name everywhere.
+
+       * FOR-RELEASE: ``MS-DOG'', ``MSDOG'' and ``msdog'' become
+       ``MS-DOS''.
+       * MAINTAINERS: ditto.
+
 2014-07-14  Paul Eggert  <address@hidden>
 
        Use binary-io module, O_BINARY, and "b" flag (Bug#18006).

=== modified file 'admin/FOR-RELEASE'
--- a/admin/FOR-RELEASE 2014-06-06 06:49:17 +0000
+++ b/admin/FOR-RELEASE 2014-08-07 09:55:09 +0000
@@ -202,8 +202,8 @@
 mini.texi         
 misc.texi         
 modes.texi        
-msdog.texi        
-msdog-xtra.texi   
+msdos.texi        
+msdos-xtra.texi   
 mule.texi         
 m-x.texi          
 package.texi      

=== modified file 'admin/MAINTAINERS'
--- a/admin/MAINTAINERS 2013-01-09 04:00:57 +0000
+++ b/admin/MAINTAINERS 2014-08-07 09:55:09 +0000
@@ -36,7 +36,7 @@
            lisp/dos-fns.el
            lisp/dos-w32.el
            lisp/dos-vars.el
-           doc/emacs/msdog.texi
+           doc/emacs/msdos.texi
 
 Kenichi Handa
        Mule

=== modified file 'doc/emacs/ChangeLog'
--- a/doc/emacs/ChangeLog       2014-07-21 06:03:08 +0000
+++ b/doc/emacs/ChangeLog       2014-08-07 09:55:09 +0000
@@ -1,3 +1,15 @@
+2014-08-07  Reuben Thomas  <address@hidden>
+
+       Refer to MS-DOS using the same name everywhere.
+
+       * Makefile.in (EMACSSOURCES): ``MS-DOG'', ``MSDOG'' and ``msdog''
+       become ``MS-DOS''; ``msdog'' in filenames becomes ``msdos''.
+       * emacs-xtra.texi: ditto.
+       * emacs.texi: ditto.
+       * makefile.w32-in: ditto.
+       * msdog-xtra.texi: ditto, and rename file.
+       * msdog.texi: ditto, and rename file.
+
 2014-07-21  Glenn Morris  <address@hidden>
 
        * emacs.texi (Intro): Workaround makeinfo 4 @acronym bug.  (Bug#18040)

=== modified file 'doc/emacs/Makefile.in'
--- a/doc/emacs/Makefile.in     2014-06-23 06:43:20 +0000
+++ b/doc/emacs/Makefile.in     2014-08-07 09:55:09 +0000
@@ -91,7 +91,7 @@
        $(srcdir)/vc-xtra.texi \
        $(srcdir)/vc1-xtra.texi \
        $(srcdir)/fortran-xtra.texi \
-       $(srcdir)/msdog-xtra.texi
+       $(srcdir)/msdos-xtra.texi
 
 EMACSSOURCES= \
        ${srcdir}/emacs.texi \
@@ -135,7 +135,7 @@
        ${srcdir}/xresources.texi \
        ${srcdir}/anti.texi \
        ${srcdir}/macos.texi \
-       ${srcdir}/msdog.texi \
+       ${srcdir}/msdos.texi \
        ${srcdir}/gnu.texi \
        ${srcdir}/glossary.texi \
        ${srcdir}/ack.texi \

=== modified file 'doc/emacs/emacs-xtra.texi'
--- a/doc/emacs/emacs-xtra.texi 2014-06-10 02:20:31 +0000
+++ b/doc/emacs/emacs-xtra.texi 2014-08-07 09:55:09 +0000
@@ -120,7 +120,7 @@
 
 @include fortran-xtra.texi
 
address@hidden msdog-xtra.texi
address@hidden msdos-xtra.texi
 
 @lowersections
 @end iftex

=== modified file 'doc/emacs/emacs.texi'
--- a/doc/emacs/emacs.texi      2014-07-21 06:03:08 +0000
+++ b/doc/emacs/emacs.texi      2014-08-07 09:55:09 +0000
@@ -1574,8 +1574,8 @@
 
 @include anti.texi
 @include macos.texi
address@hidden Includes msdog-xtra.
address@hidden msdog.texi
address@hidden Includes msdos-xtra.
address@hidden msdos.texi
 @include gnu.texi
 @include glossary.texi
 @ifnottex

=== modified file 'doc/emacs/makefile.w32-in'
--- a/doc/emacs/makefile.w32-in 2014-01-01 07:43:34 +0000
+++ b/doc/emacs/makefile.w32-in 2014-08-07 09:55:09 +0000
@@ -54,7 +54,7 @@
        $(srcdir)/vc-xtra.texi \
        $(srcdir)/vc1-xtra.texi \
        $(srcdir)/fortran-xtra.texi \
-       $(srcdir)/msdog-xtra.texi
+       $(srcdir)/msdos-xtra.texi
 
 EMACSSOURCES= \
        $(srcdir)/emacs.texi \
@@ -97,7 +97,7 @@
        $(srcdir)/xresources.texi \
        $(srcdir)/anti.texi \
        $(srcdir)/macos.texi \
-       $(srcdir)/msdog.texi \
+       $(srcdir)/msdos.texi \
        $(srcdir)/gnu.texi \
        $(srcdir)/glossary.texi \
        $(srcdir)/ack.texi \

=== renamed file 'doc/emacs/msdog-xtra.texi' => 'doc/emacs/msdos-xtra.texi'
--- a/doc/emacs/msdog-xtra.texi 2014-04-29 14:45:24 +0000
+++ b/doc/emacs/msdos-xtra.texi 2014-08-07 09:55:09 +0000
@@ -6,19 +6,18 @@
 @c printed version) or in the main Emacs manual (for the on-line version).
 @node MS-DOS
 @section Emacs and MS-DOS
address@hidden MS-DOG
 @cindex MS-DOS peculiarities
 
   This section briefly describes the peculiarities of using Emacs on
-the MS-DOS ``operating system'' (also known as ``MS-DOG'').
+the MS-DOS ``operating system''.
 @iftex
 Information about Emacs and Microsoft's current operating system
-Windows (also known as ``Losedows'') is in the main Emacs manual
+Windows is in the main Emacs manual
 (@pxref{Microsoft Windows,,, emacs, the Emacs Manual}).
 @end iftex
 @ifnottex
 Information about peculiarities common to MS-DOS and Microsoft's
-current operating systems Windows (also known as ``Losedows'') is in
+current operating systems Windows is in
 @ref{Microsoft Windows}.
 @end ifnottex
 

=== renamed file 'doc/emacs/msdog.texi' => 'doc/emacs/msdos.texi'
--- a/doc/emacs/msdog.texi      2014-06-08 01:20:35 +0000
+++ b/doc/emacs/msdos.texi      2014-08-07 09:55:09 +0000
@@ -9,7 +9,7 @@
 
   This section describes peculiarities of using Emacs on Microsoft
 Windows.  Some of these peculiarities are also relevant to Microsoft's
-older MS-DOS ``operating system'' (also known as ``MS-DOG'').
+older MS-DOS operating system.
 However, Emacs features that are relevant @emph{only} to MS-DOS are
 described in a separate
 @iftex
@@ -986,5 +986,5 @@
 @end ifnottex
 
 @ifnottex
address@hidden msdog-xtra.texi
address@hidden msdos-xtra.texi
 @end ifnottex

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-08-07 09:13:54 +0000
+++ b/lisp/ChangeLog    2014-08-07 09:55:09 +0000
@@ -1,3 +1,11 @@
+2014-08-07  Reuben Thomas  <address@hidden>
+
+       Refer to MS-DOS using the same name everywhere.
+
+       * arc-mode.el: ``MS-DOG'', ``MSDOG'' and ``msdog'' become
+       ``MS-DOS''.
+       * frame.el: ditto.
+
 2014-08-07  Michael Albinus  <address@hidden>
 
        * net/tramp-sh.el (tramp-do-copy-or-rename-file-out-of-band):

=== modified file 'lisp/arc-mode.el'
--- a/lisp/arc-mode.el  2014-01-16 06:24:06 +0000
+++ b/lisp/arc-mode.el  2014-08-07 09:55:09 +0000
@@ -4,7 +4,7 @@
 ;; Inc.
 
 ;; Author: Morten Welinder <address@hidden>
-;; Keywords: files archives msdog editing major-mode
+;; Keywords: files archives ms-dos editing major-mode
 ;; Favorite-brand-of-beer: None, I hate beer.
 
 ;; This file is part of GNU Emacs.

=== modified file 'lisp/frame.el'
--- a/lisp/frame.el     2014-07-27 13:21:30 +0000
+++ b/lisp/frame.el     2014-08-07 09:55:09 +0000
@@ -1344,8 +1344,8 @@
   (let ((frame-type (framep-on-display display)))
     (cond
      ((eq frame-type 'pc)
-      ;; MS-DOG frames support selections when Emacs runs inside
-      ;; the Windows' DOS Box.
+      ;; MS-DOS frames support selections when Emacs runs inside
+      ;; a Windows DOS Box.
       (with-no-warnings
        (not (null dos-windows-version))))
      ((memq frame-type '(x w32 ns))