From 6c5bbf8a00919b191d5319ee9324c93f1c496dbf Mon Sep 17 00:00:00 2001 From: Reuben Thomas Date: Thu, 7 Aug 2014 11:15:52 +0100 Subject: [PATCH] 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. --- ChangeLog | 4 ++++ README | 2 +- lisp/ChangeLog | 8 ++++++++ lisp/arc-mode.el | 2 +- lisp/files.el | 7 +++---- src/ChangeLog | 8 ++++++++ src/editfns.c | 2 +- src/xfaces.c | 2 +- 8 files changed, 27 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 69945b96c23..b7b2ce9a22f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-08-07 Reuben Thomas + + * README: ``MSDOG'' becomes ``MS-DOS''. + 2014-08-04 Paul Eggert Merge from gnulib, incorporating: diff --git a/README b/README index 9f0ff0c5daa..daf7b0dbfda 100644 --- 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 7c529d1f0d3..9948ec0d3c0 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,11 @@ +2014-08-07 Reuben Thomas + + 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 Refer to MS-DOS using the same name everywhere. 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 @@ ;; 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 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) ("\\.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 a5560f09e0f..9369ee25cca 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,11 @@ +2014-08-07 Reuben Thomas + + 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 * 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); -- 2.39.5