Skip to content

Commit 563e8ec

Browse files
nir9chrisbra
authored andcommitted
patch 9.1.0750: there are some Win9x legacy references
Problem: there are some Win9x legacy references Solution: Remove those mentions (Nir Lichtman) closes: #15730 Signed-off-by: Nir Lichtman <nir@lichtman.org> Signed-off-by: Christian Brabandt <cb@256bit.org>
1 parent 85f054a commit 563e8ec

8 files changed

Lines changed: 13 additions & 45 deletions

File tree

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -285,10 +285,10 @@ dist/$(COMMENT_RT): dist/comment
285285
echo "Vim - Vi IMproved - v$(VDOT) runtime files for MS-DOS and MS-Windows" > dist/$(COMMENT_RT)
286286

287287
dist/$(COMMENT_W32): dist/comment
288-
echo "Vim - Vi IMproved - v$(VDOT) binaries for MS-Windows NT/95" > dist/$(COMMENT_W32)
288+
echo "Vim - Vi IMproved - v$(VDOT) binaries for MS-Windows" > dist/$(COMMENT_W32)
289289

290290
dist/$(COMMENT_GVIM): dist/comment
291-
echo "Vim - Vi IMproved - v$(VDOT) GUI binaries for MS-Windows NT/95" > dist/$(COMMENT_GVIM)
291+
echo "Vim - Vi IMproved - v$(VDOT) GUI binaries for MS-Windows" > dist/$(COMMENT_GVIM)
292292

293293
dist/$(COMMENT_OLE): dist/comment
294294
echo "Vim - Vi IMproved - v$(VDOT) MS-Windows GUI binaries with OLE support" > dist/$(COMMENT_OLE)

READMEdir/README_bindos.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ These files are in the runtime archive (vim91rt.zip).
88
There are several binary distributions of Vim for the PC. You would normally
99
pick only one of them, but it's also possible to install several.
1010
These ones are available (the version number may differ):
11-
vim91w32.zip Windows 95/98/NT/etc. console version
12-
gvim91.zip Windows 95/98/NT/etc. GUI version
13-
gvim91ole.zip Windows 95/98/NT/etc. GUI version with OLE
11+
vim91w32.zip Windows console version
12+
gvim91.zip Windows GUI version
13+
gvim91ole.zip Windows GUI version with OLE
1414

1515
You MUST also get the runtime archive (vim91rt.zip).
1616
The sources are also available (vim91src.zip).

READMEdir/README_dos.txt

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -120,30 +120,6 @@ Remarks:
120120
entry, you can remove it by running the "uninstall.exe". See
121121
":help win32-popup-menu".
122122

123-
- In Windows 95/98/NT you can create a shortcut to Vim. This works for all
124-
DOS and Win32 console versions. For the console version this gives you the
125-
opportunity to set defaults for the Console where Vim runs in.
126-
127-
1. On the desktop, click right to get a menu. Select New/Shortcut.
128-
2. In the dialog, enter Command line: "C:\command.com". Click "Next".
129-
3. Enter any name. Click "Finish".
130-
The new shortcut will appear on the desktop.
131-
4. With the mouse pointer on the new shortcut, click right to get a menu.
132-
Select Properties.
133-
5. In the Program tab, change the "Cmdline" to add "/c" and the name of the
134-
Vim executable. Examples:
135-
C:\command.com /c C:\vim\vim91\vim.exe
136-
C:\command.com /c D:\editors\vim\vim91\vim.exe
137-
6. Select the font, window size, etc. that you like. If this isn't
138-
possible, select "Advanced" in the Program tab, and deselect "MS-DOS
139-
mode".
140-
7. Click OK.
141-
142-
For gvim, you can use a normal shortcut on the desktop, and set the size of
143-
the Window in your $VIM/_gvimrc:
144-
set lines=30 columns=90
145-
146-
147123
For further information, type one of these inside Vim:
148124
:help dos
149125
:help win32

READMEdir/README_extra.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ src/gui_w32.* Files for the Win32 GUI.
2727
src/gui_w48.* Files for the Win32 and Win16 GUI.
2828
src/Make_mvc.mak MS Visual C++ makefile for the Win32 GUI.
2929

30-
src/if_ole.* OLE automation interface, for MS Windows 95 and NT.
30+
src/if_ole.* OLE automation interface, for MS Windows.
3131

3232
src/GvimExt/* DLL for the "Edit with Vim" context menu entry
3333

READMEdir/README_ole.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ README_ole.txt for version 9.1 of Vim: Vi IMproved.
33
This archive contains gvim.exe with OLE interface.
44
This version of gvim.exe can also load a number of interface dynamically (you
55
can optionally install the .dll files for each interface).
6-
It is only for MS-Windows 95/98/ME/NT/2000/XP.
6+
It is only for MS-Windows.
77

88
Also see the README_bindos.txt, README_dos.txt and README.txt files.
99

src/os_win32.c

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
* Used for both the console version and the Win32 GUI. A lot of code is for
1313
* the console version only, so there is a lot of "#ifndef FEAT_GUI_MSWIN".
1414
*
15-
* Win32 (Windows NT and Windows 95) system-dependent routines.
15+
* Win32 system-dependent routines.
1616
* Portions lifted from the Win32 SDK samples, the MSDOS-dependent code,
1717
* NetHack 3.1.3, GNU Emacs 19.30, and Vile 5.5.
1818
*
@@ -7572,19 +7572,9 @@ mch_total_mem(int special UNUSED)
75727572

75737573
/*
75747574
* mch_wrename() works around a bug in rename (aka MoveFile) in
7575-
* Windows 95: rename("foo.bar", "foo.bar~") will generate a
7576-
* file whose short file name is "FOO.BAR" (its long file name will
7577-
* be correct: "foo.bar~"). Because a file can be accessed by
7578-
* either its SFN or its LFN, "foo.bar" has effectively been
7579-
* renamed to "foo.bar", which is not at all what was wanted. This
7580-
* seems to happen only when renaming files with three-character
7581-
* extensions by appending a suffix that does not include ".".
7582-
* Windows NT gets it right, however, with an SFN of "FOO~1.BAR".
7583-
*
7584-
* There is another problem, which isn't really a bug but isn't right either:
7575+
* Windows, the bug can be demonstrated with the following scenario:
75857576
* When renaming "abcdef~1.txt" to "abcdef~1.txt~", the short name can be
7586-
* "abcdef~1.txt" again. This has been reported on Windows NT 4.0 with
7587-
* service pack 6. Doesn't seem to happen on Windows 98.
7577+
* "abcdef~1.txt" again.
75887578
*
75897579
* Like rename(), returns 0 upon success, non-zero upon failure.
75907580
* Should probably set errno appropriately when errors occur.

src/os_win32.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*/
88

99
/*
10-
* Win32 (Windows NT and Windows 95) machine-dependent things.
10+
* Win32 machine-dependent things.
1111
*/
1212

1313
#include "os_dos.h" // common MS-DOS and Win32 stuff

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -704,6 +704,8 @@ static char *(features[]) =
704704

705705
static int included_patches[] =
706706
{ /* Add new patch number below this line */
707+
/**/
708+
750,
707709
/**/
708710
749,
709711
/**/

0 commit comments

Comments
 (0)