diff options
| author | Reuben Thomas | 2014-08-07 10:55:09 +0100 |
|---|---|---|
| committer | Reuben Thomas | 2014-08-07 10:55:09 +0100 |
| commit | df514ccf9b9e6a4a3864d57c92425b7d7de1fd7b (patch) | |
| tree | f041962dcd5ea00fa2875674950d9e02fdea7151 /lisp | |
| parent | ddc4ed129b9758985cc25d4d104e750de558df56 (diff) | |
| download | emacs-df514ccf9b9e6a4a3864d57c92425b7d7de1fd7b.tar.gz emacs-df514ccf9b9e6a4a3864d57c92425b7d7de1fd7b.zip | |
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.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 8 | ||||
| -rw-r--r-- | lisp/arc-mode.el | 2 | ||||
| -rw-r--r-- | lisp/frame.el | 4 |
3 files changed, 11 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8889c046f62..7c529d1f0d3 100644 --- a/lisp/ChangeLog +++ b/lisp/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 | * arc-mode.el: ``MS-DOG'', ``MSDOG'' and ``msdog'' become | ||
| 6 | ``MS-DOS''. | ||
| 7 | * frame.el: ditto. | ||
| 8 | |||
| 1 | 2014-08-07 Michael Albinus <michael.albinus@gmx.de> | 9 | 2014-08-07 Michael Albinus <michael.albinus@gmx.de> |
| 2 | 10 | ||
| 3 | * net/tramp-sh.el (tramp-do-copy-or-rename-file-out-of-band): | 11 | * net/tramp-sh.el (tramp-do-copy-or-rename-file-out-of-band): |
diff --git a/lisp/arc-mode.el b/lisp/arc-mode.el index 37ddf87cfbf..f1bdbf1a325 100644 --- a/lisp/arc-mode.el +++ b/lisp/arc-mode.el | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | ;; Inc. | 4 | ;; Inc. |
| 5 | 5 | ||
| 6 | ;; Author: Morten Welinder <terra@gnu.org> | 6 | ;; Author: Morten Welinder <terra@gnu.org> |
| 7 | ;; Keywords: files archives msdog editing major-mode | 7 | ;; Keywords: files archives ms-dos editing major-mode |
| 8 | ;; Favorite-brand-of-beer: None, I hate beer. | 8 | ;; Favorite-brand-of-beer: None, I hate beer. |
| 9 | 9 | ||
| 10 | ;; This file is part of GNU Emacs. | 10 | ;; This file is part of GNU Emacs. |
diff --git a/lisp/frame.el b/lisp/frame.el index d3e84d21024..d528eef6735 100644 --- a/lisp/frame.el +++ b/lisp/frame.el | |||
| @@ -1344,8 +1344,8 @@ frame's display)." | |||
| 1344 | (let ((frame-type (framep-on-display display))) | 1344 | (let ((frame-type (framep-on-display display))) |
| 1345 | (cond | 1345 | (cond |
| 1346 | ((eq frame-type 'pc) | 1346 | ((eq frame-type 'pc) |
| 1347 | ;; MS-DOG frames support selections when Emacs runs inside | 1347 | ;; MS-DOS frames support selections when Emacs runs inside |
| 1348 | ;; the Windows' DOS Box. | 1348 | ;; a Windows DOS Box. |
| 1349 | (with-no-warnings | 1349 | (with-no-warnings |
| 1350 | (not (null dos-windows-version)))) | 1350 | (not (null dos-windows-version)))) |
| 1351 | ((memq frame-type '(x w32 ns)) | 1351 | ((memq frame-type '(x w32 ns)) |