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 /lisp | |
| 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 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 8 | ||||
| -rw-r--r-- | lisp/arc-mode.el | 2 | ||||
| -rw-r--r-- | lisp/files.el | 7 |
3 files changed, 12 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 7c529d1f0d3..9948ec0d3c0 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -2,6 +2,14 @@ | |||
| 2 | 2 | ||
| 3 | Refer to MS-DOS using the same name everywhere. | 3 | Refer to MS-DOS using the same name everywhere. |
| 4 | 4 | ||
| 5 | * arc-mode.el: Fix a couple of ``MS-DOG''s missed in the previous | ||
| 6 | commit. | ||
| 7 | * file-mode.el: ditto. | ||
| 8 | |||
| 9 | 2014-08-07 Reuben Thomas <rrt@sc3d.org> | ||
| 10 | |||
| 11 | Refer to MS-DOS using the same name everywhere. | ||
| 12 | |||
| 5 | * arc-mode.el: ``MS-DOG'', ``MSDOG'' and ``msdog'' become | 13 | * arc-mode.el: ``MS-DOG'', ``MSDOG'' and ``msdog'' become |
| 6 | ``MS-DOS''. | 14 | ``MS-DOS''. |
| 7 | * frame.el: ditto. | 15 | * frame.el: ditto. |
diff --git a/lisp/arc-mode.el b/lisp/arc-mode.el index f1bdbf1a325..ef155ee2b99 100644 --- a/lisp/arc-mode.el +++ b/lisp/arc-mode.el | |||
| @@ -31,7 +31,7 @@ | |||
| 31 | ;; understand the directory level of the archives. For this reason, | 31 | ;; understand the directory level of the archives. For this reason, |
| 32 | ;; you should expect this code to need more fiddling than tar-mode.el | 32 | ;; you should expect this code to need more fiddling than tar-mode.el |
| 33 | ;; (although it at present has fewer bugs :-) In particular, I have | 33 | ;; (although it at present has fewer bugs :-) In particular, I have |
| 34 | ;; not tested this under Ms-Dog myself. | 34 | ;; not tested this under MS-DOS myself. |
| 35 | ;; ------------------------------------- | 35 | ;; ------------------------------------- |
| 36 | ;; INTERACTION: arc-mode.el should play together with | 36 | ;; INTERACTION: arc-mode.el should play together with |
| 37 | ;; | 37 | ;; |
diff --git a/lisp/files.el b/lisp/files.el index 9272e98384f..597afb99120 100644 --- a/lisp/files.el +++ b/lisp/files.el | |||
| @@ -2412,11 +2412,10 @@ ARC\\|ZIP\\|LZH\\|LHA\\|ZOO\\|[JEW]AR\\|XPI\\|RAR\\|7Z\\)\\'" . archive-mode) | |||
| 2412 | ("\\.by\\'" . bovine-grammar-mode) | 2412 | ("\\.by\\'" . bovine-grammar-mode) |
| 2413 | ("\\.wy\\'" . wisent-grammar-mode) | 2413 | ("\\.wy\\'" . wisent-grammar-mode) |
| 2414 | ;; .emacs or .gnus or .viper following a directory delimiter in | 2414 | ;; .emacs or .gnus or .viper following a directory delimiter in |
| 2415 | ;; Unix, MSDOG or VMS syntax. | 2415 | ;; Unix or MS-DOS syntax. |
| 2416 | ("[]>:/\\]\\..*\\(emacs\\|gnus\\|viper\\)\\'" . emacs-lisp-mode) | 2416 | ("[]>:/\\]\\..*\\(emacs\\|gnus\\|viper\\)\\'" . emacs-lisp-mode) |
| 2417 | ("\\`\\..*emacs\\'" . emacs-lisp-mode) | 2417 | ("\\`\\..*emacs\\'" . emacs-lisp-mode) |
| 2418 | ;; _emacs following a directory delimiter | 2418 | ;; _emacs following a directory delimiter in MS-DOS syntax |
| 2419 | ;; in MsDos syntax | ||
| 2420 | ("[:/]_emacs\\'" . emacs-lisp-mode) | 2419 | ("[:/]_emacs\\'" . emacs-lisp-mode) |
| 2421 | ("/crontab\\.X*[0-9]+\\'" . shell-script-mode) | 2420 | ("/crontab\\.X*[0-9]+\\'" . shell-script-mode) |
| 2422 | ("\\.ml\\'" . lisp-mode) | 2421 | ("\\.ml\\'" . lisp-mode) |
| @@ -2439,7 +2438,7 @@ ARC\\|ZIP\\|LZH\\|LHA\\|ZOO\\|[JEW]AR\\|XPI\\|RAR\\|7Z\\)\\'" . archive-mode) | |||
| 2439 | ("\\.\\(asn\\|mib\\|smi\\)\\'" . snmp-mode) | 2438 | ("\\.\\(asn\\|mib\\|smi\\)\\'" . snmp-mode) |
| 2440 | ("\\.\\(as\\|mi\\|sm\\)2\\'" . snmpv2-mode) | 2439 | ("\\.\\(as\\|mi\\|sm\\)2\\'" . snmpv2-mode) |
| 2441 | ("\\.\\(diffs?\\|patch\\|rej\\)\\'" . diff-mode) | 2440 | ("\\.\\(diffs?\\|patch\\|rej\\)\\'" . diff-mode) |
| 2442 | ("\\.\\(dif\\|pat\\)\\'" . diff-mode) ; for MSDOG | 2441 | ("\\.\\(dif\\|pat\\)\\'" . diff-mode) ; for MS-DOS |
| 2443 | ("\\.[eE]?[pP][sS]\\'" . ps-mode) | 2442 | ("\\.[eE]?[pP][sS]\\'" . ps-mode) |
| 2444 | ("\\.\\(?:PDF\\|DVI\\|OD[FGPST]\\|DOCX?\\|XLSX?\\|PPTX?\\|pdf\\|djvu\\|dvi\\|od[fgpst]\\|docx?\\|xlsx?\\|pptx?\\)\\'" . doc-view-mode-maybe) | 2443 | ("\\.\\(?:PDF\\|DVI\\|OD[FGPST]\\|DOCX?\\|XLSX?\\|PPTX?\\|pdf\\|djvu\\|dvi\\|od[fgpst]\\|docx?\\|xlsx?\\|pptx?\\)\\'" . doc-view-mode-maybe) |
| 2445 | ("configure\\.\\(ac\\|in\\)\\'" . autoconf-mode) | 2444 | ("configure\\.\\(ac\\|in\\)\\'" . autoconf-mode) |