patch 7.4.1022

Problem:    The README file contains some outdated information.
Solution:   Update the information about supported systems.

diff --git a/README.md b/README.md
index 042a17708e44dd7cb6d8dce5eeb7fceed204c8a2..1d2a93350e2663b315350b52a270d6669daac8ca 100644 (file)
--- a/README.md
+++ b/README.md
@@ -17,9 +17,10 @@ All commands are given with normal keyboard characters, so those who can type
 with ten fingers can work very fast.  Additionally, function keys can be
 defined by the user, and the mouse can be used.
 
-Vim runs under Amiga DOS, MS-DOS, MS-Windows (95, 98, Me, NT, 2000, XP, Vista,
-7), Atari MiNT, Macintosh, BeOS, VMS, RISC OS, OS/2 and almost all flavours of
-UNIX.  Porting to other systems should not be very difficult.
+Vim runs under MS-DOS, MS-Windows (NT, 2000, XP, Vista, 7, 8, 10), Macintosh,
+VMS and almost all flavours of UNIX.  Porting to other systems should not be
+very difficult.  Older versions of Vim run on MS-Windows 95/98/Me, Amiga DOS,
+Atari MiNT, BeOS, RISC OS and OS/2.  These are no longer maintained.
 
 
 ## Distribution ##
@@ -89,7 +90,6 @@ See one of these files for system-specific instructions:
        README_ami.txt          Amiga
        README_unix.txt         Unix
        README_dos.txt          MS-DOS and MS-Windows
-       README_os2.txt          OS/2
        README_mac.txt          Macintosh
        README_vms.txt          VMS
 

diff --git a/README.txt b/README.txt
index d9fc6464db5ef10a1fd772ae2669e4353c7aaa14..b9932f135d38126e6dbdec8336fe101352938cc6 100644 (file)
--- a/README.txt
+++ b/README.txt
@@ -14,9 +14,10 @@ All commands are given with normal keyboard characters, so those who can type
 with ten fingers can work very fast.  Additionally, function keys can be
 defined by the user, and the mouse can be used.
 
-Vim runs under Amiga DOS, MS-DOS, MS-Windows (95, 98, Me, NT, 2000, XP, Vista,
-7), Atari MiNT, Macintosh, BeOS, VMS, RISC OS, OS/2 and almost all flavours of
-UNIX.  Porting to other systems should not be very difficult.
+Vim runs under MS-DOS, MS-Windows (NT, 2000, XP, Vista, 7, 8, 10), Macintosh,
+VMS and almost all flavours of UNIX.  Porting to other systems should not be
+very difficult.  Older versions of Vim run on MS-Windows 95/98/Me, Amiga DOS,
+Atari MiNT, BeOS, RISC OS and OS/2.  These are no longer maintained.
 
 
 DISTRIBUTION
@@ -86,7 +87,6 @@ See one of these files for system-specific instructions:
 README_ami.txt         Amiga
 README_unix.txt                Unix
 README_dos.txt         MS-DOS and MS-Windows
-README_os2.txt         OS/2
 README_mac.txt         Macintosh
 README_vms.txt         VMS
 

diff --git a/src/version.c b/src/version.c
index c750066f76b90d04e733877ebc017fd556029993..77a77f201d9f4bcd269be98580ae3b9aca35cdc0 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1022,
 /**/
     1021,
 /**/