summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-01-01 18:34:39 +0100
committerBram Moolenaar <Bram@vim.org>2016-01-01 18:34:39 +0100
commit43f837dea588207c87c34794b19c024e9ff1db3e (patch)
tree2eff5ce0b90e38abd726d50432cba271bcb8e45a
parent17b609ed7f3d718e233a561f792f7473e48b0aaa (diff)
patch 7.4.1022v7.4.1022
Problem: The README file contains some outdated information. Solution: Update the information about supported systems.
-rw-r--r--README.md8
-rw-r--r--README.txt8
-rw-r--r--src/version.c2
3 files changed, 10 insertions, 8 deletions
diff --git a/README.md b/README.md
index 042a17708e..1d2a93350e 100644
--- 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 d9fc6464db..b9932f135d 100644
--- 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 c750066f76..77a77f201d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1022,
+/**/
1021,
/**/
1020,