mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-21 06:55:39 +00:00
Code Issues Releases Activity

Fix a few ``MS-DOG''s overlooked in the previous commit.

Browse Source 
* 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.
This commit is contained in:
Reuben Thomas 2014-08-07 11:15:52 +01:00
parent df514ccf9b
commit 6c5bbf8a00
8 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -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:

2
README
View File

@ -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

8
lisp/ChangeLog
View File

@ -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.

2
lisp/arc-mode.el
View File

@ -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
;;

7
lisp/files.el
View File

@ -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)

8
src/ChangeLog
View File

@ -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):

2
src/editfns.c
View File

@ -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

2
src/xfaces.c
View File

@ -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);