From 563e8ec8c78b4141a6497f14e825be2d63cb891c Mon Sep 17 00:00:00 2001 From: Nir Lichtman Date: Mon, 30 Sep 2024 19:42:28 +0200 Subject: [PATCH] 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 Signed-off-by: Christian Brabandt --- Makefile | 4 ++-- READMEdir/README_bindos.txt | 6 +++--- READMEdir/README_dos.txt | 24 ------------------------ READMEdir/README_extra.txt | 2 +- READMEdir/README_ole.txt | 2 +- src/os_win32.c | 16 +++------------- src/os_win32.h | 2 +- src/version.c | 2 ++ 8 files changed, 13 insertions(+), 45 deletions(-) diff --git a/Makefile b/Makefile index c77a6ec96c..abe2103581 100644 --- a/Makefile +++ b/Makefile @@ -285,10 +285,10 @@ dist/$(COMMENT_RT): dist/comment echo "Vim - Vi IMproved - v$(VDOT) runtime files for MS-DOS and MS-Windows" > dist/$(COMMENT_RT) dist/$(COMMENT_W32): dist/comment - echo "Vim - Vi IMproved - v$(VDOT) binaries for MS-Windows NT/95" > dist/$(COMMENT_W32) + echo "Vim - Vi IMproved - v$(VDOT) binaries for MS-Windows" > dist/$(COMMENT_W32) dist/$(COMMENT_GVIM): dist/comment - echo "Vim - Vi IMproved - v$(VDOT) GUI binaries for MS-Windows NT/95" > dist/$(COMMENT_GVIM) + echo "Vim - Vi IMproved - v$(VDOT) GUI binaries for MS-Windows" > dist/$(COMMENT_GVIM) dist/$(COMMENT_OLE): dist/comment echo "Vim - Vi IMproved - v$(VDOT) MS-Windows GUI binaries with OLE support" > dist/$(COMMENT_OLE) diff --git a/READMEdir/README_bindos.txt b/READMEdir/README_bindos.txt index b1907dd77f..51fc2c59ef 100644 --- a/READMEdir/README_bindos.txt +++ b/READMEdir/README_bindos.txt @@ -8,9 +8,9 @@ These files are in the runtime archive (vim91rt.zip). There are several binary distributions of Vim for the PC. You would normally pick only one of them, but it's also possible to install several. These ones are available (the version number may differ): - vim91w32.zip Windows 95/98/NT/etc. console version - gvim91.zip Windows 95/98/NT/etc. GUI version - gvim91ole.zip Windows 95/98/NT/etc. GUI version with OLE + vim91w32.zip Windows console version + gvim91.zip Windows GUI version + gvim91ole.zip Windows GUI version with OLE You MUST also get the runtime archive (vim91rt.zip). The sources are also available (vim91src.zip). diff --git a/READMEdir/README_dos.txt b/READMEdir/README_dos.txt index 6a7905d771..c650980459 100644 --- a/READMEdir/README_dos.txt +++ b/READMEdir/README_dos.txt @@ -120,30 +120,6 @@ Remarks: entry, you can remove it by running the "uninstall.exe". See ":help win32-popup-menu". -- In Windows 95/98/NT you can create a shortcut to Vim. This works for all - DOS and Win32 console versions. For the console version this gives you the - opportunity to set defaults for the Console where Vim runs in. - - 1. On the desktop, click right to get a menu. Select New/Shortcut. - 2. In the dialog, enter Command line: "C:\command.com". Click "Next". - 3. Enter any name. Click "Finish". - The new shortcut will appear on the desktop. - 4. With the mouse pointer on the new shortcut, click right to get a menu. - Select Properties. - 5. In the Program tab, change the "Cmdline" to add "/c" and the name of the - Vim executable. Examples: - C:\command.com /c C:\vim\vim91\vim.exe - C:\command.com /c D:\editors\vim\vim91\vim.exe - 6. Select the font, window size, etc. that you like. If this isn't - possible, select "Advanced" in the Program tab, and deselect "MS-DOS - mode". - 7. Click OK. - - For gvim, you can use a normal shortcut on the desktop, and set the size of - the Window in your $VIM/_gvimrc: - set lines=30 columns=90 - - For further information, type one of these inside Vim: :help dos :help win32 diff --git a/READMEdir/README_extra.txt b/READMEdir/README_extra.txt index f4090a0ee0..ca88e2d0fc 100644 --- a/READMEdir/README_extra.txt +++ b/READMEdir/README_extra.txt @@ -27,7 +27,7 @@ src/gui_w32.* Files for the Win32 GUI. src/gui_w48.* Files for the Win32 and Win16 GUI. src/Make_mvc.mak MS Visual C++ makefile for the Win32 GUI. -src/if_ole.* OLE automation interface, for MS Windows 95 and NT. +src/if_ole.* OLE automation interface, for MS Windows. src/GvimExt/* DLL for the "Edit with Vim" context menu entry diff --git a/READMEdir/README_ole.txt b/READMEdir/README_ole.txt index 86b343be35..f34b679a1c 100644 --- a/READMEdir/README_ole.txt +++ b/READMEdir/README_ole.txt @@ -3,7 +3,7 @@ README_ole.txt for version 9.1 of Vim: Vi IMproved. This archive contains gvim.exe with OLE interface. This version of gvim.exe can also load a number of interface dynamically (you can optionally install the .dll files for each interface). -It is only for MS-Windows 95/98/ME/NT/2000/XP. +It is only for MS-Windows. Also see the README_bindos.txt, README_dos.txt and README.txt files. diff --git a/src/os_win32.c b/src/os_win32.c index 6384ac8736..e5351b1ce1 100644 --- a/src/os_win32.c +++ b/src/os_win32.c @@ -12,7 +12,7 @@ * Used for both the console version and the Win32 GUI. A lot of code is for * the console version only, so there is a lot of "#ifndef FEAT_GUI_MSWIN". * - * Win32 (Windows NT and Windows 95) system-dependent routines. + * Win32 system-dependent routines. * Portions lifted from the Win32 SDK samples, the MSDOS-dependent code, * NetHack 3.1.3, GNU Emacs 19.30, and Vile 5.5. * @@ -7572,19 +7572,9 @@ mch_total_mem(int special UNUSED) /* * mch_wrename() works around a bug in rename (aka MoveFile) in - * Windows 95: rename("foo.bar", "foo.bar~") will generate a - * file whose short file name is "FOO.BAR" (its long file name will - * be correct: "foo.bar~"). Because a file can be accessed by - * either its SFN or its LFN, "foo.bar" has effectively been - * renamed to "foo.bar", which is not at all what was wanted. This - * seems to happen only when renaming files with three-character - * extensions by appending a suffix that does not include ".". - * Windows NT gets it right, however, with an SFN of "FOO~1.BAR". - * - * There is another problem, which isn't really a bug but isn't right either: + * Windows, the bug can be demonstrated with the following scenario: * When renaming "abcdef~1.txt" to "abcdef~1.txt~", the short name can be - * "abcdef~1.txt" again. This has been reported on Windows NT 4.0 with - * service pack 6. Doesn't seem to happen on Windows 98. + * "abcdef~1.txt" again. * * Like rename(), returns 0 upon success, non-zero upon failure. * Should probably set errno appropriately when errors occur. diff --git a/src/os_win32.h b/src/os_win32.h index 5995e70af2..96d4c8cc6e 100644 --- a/src/os_win32.h +++ b/src/os_win32.h @@ -7,7 +7,7 @@ */ /* - * Win32 (Windows NT and Windows 95) machine-dependent things. + * Win32 machine-dependent things. */ #include "os_dos.h" // common MS-DOS and Win32 stuff diff --git a/src/version.c b/src/version.c index d1361508ea..7725549b14 100644 --- a/src/version.c +++ b/src/version.c @@ -704,6 +704,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 750, /**/ 749, /**/