patch 7.4.1684
Problem: README text is slightly outdated.
Solution: Mention the READMEdir directory.
diff --git a/README.md b/README.md
index 6c54338..d368a75 100644
--- a/README.md
+++ b/README.md
@@ -7,21 +7,23 @@
## What is Vim? ##
-Vim is an almost compatible version of the UNIX editor Vi. Many new features
-have been added: multi-level undo, syntax highlighting, command line history,
-on-line help, spell checking, filename completion, block operations, etc.
-There is also a Graphical User Interface (GUI) available. See
-`runtime/doc/vi_diff.txt` for differences with Vi.
+Vim is a greatly improved version of the good old UNIX editor Vi. Many new
+features have been added: multi-level undo, syntax highlighting, command line
+history, on-line help, spell checking, filename completion, block operations,
+script language, etc. There is also a Graphical User Interface (GUI)
+available. Still, Vi compatibility is maintained, those who have Vi "in the
+fingers" will feel at home. See `runtime/doc/vi_diff.txt` for differences with
+Vi.
This editor is very useful for editing programs and other plain text files.
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.
+mapped to commands by the user, and the mouse can be used.
-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.
+Vim runs under 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-DOS, MS-Windows 95/98/Me, Amiga
+DOS, Atari MiNT, BeOS, RISC OS and OS/2. These are no longer maintained.
## Distribution ##
@@ -39,9 +41,31 @@
an overview of currently available distributions.
+## Compiling ##
+
+If you obtained a binary distribution you don't need to compile Vim. If you
+obtained a source distribution, all the stuff for compiling Vim is in the
+`src` directory. See `src/INSTALL` for instructions.
+
+
+## Installation ##
+
+See one of these files for system-specific instructions. Either in the
+READMEdir directory (in the repository) or the top directory (if you unpack an
+archive):
+
+ README_ami.txt Amiga
+ README_unix.txt Unix
+ README_dos.txt MS-DOS and MS-Windows
+ README_mac.txt Macintosh
+ README_vms.txt VMS
+
+There are other `README_*.txt` files, depending on the distribution you used.
+
+
## Documentation ##
-The vim tutor is a one hour training course for beginners. Mostly it can be
+The Vim tutor is a one hour training course for beginners. Often it can be
started as `vimtutor`. See `:help tutor` for more information.
The best is to use `:help` in Vim. If you don't have an executable yet, read
@@ -77,26 +101,6 @@
http://www.vim.org/sponsor/
-## Compiling ##
-
-If you obtained a binary distribution you don't need to compile Vim. If you
-obtained a source distribution, all the stuff for compiling Vim is in the
-`src` directory. See `src/INSTALL` for instructions.
-
-
-## Installation ##
-
-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_mac.txt Macintosh
- README_vms.txt VMS
-
-There are more `README_*.txt` files, depending on the distribution you used.
-
-
## Contributing ##
If you would like to help making Vim better, see the [CONTRIBUTING.md](https://github.com/vim/vim/blob/master/CONTRIBUTING.md) file.
diff --git a/README.txt b/README.txt
index b9932f1..0d0905a 100644
--- a/README.txt
+++ b/README.txt
@@ -3,21 +3,23 @@
WHAT IS VIM?
-Vim is an almost compatible version of the UNIX editor Vi. Many new features
-have been added: multi-level undo, syntax highlighting, command line history,
-on-line help, spell checking, filename completion, block operations, etc.
-There is also a Graphical User Interface (GUI) available. See
-"runtime/doc/vi_diff.txt" for differences with Vi.
+Vim is a greatly improved version of the good old UNIX editor Vi. Many new
+features have been added: multi-level undo, syntax highlighting, command line
+history, on-line help, spell checking, filename completion, block operations,
+script language, etc. There is also a Graphical User Interface (GUI)
+available. Still, Vi compatibility is maintained, those who have Vi "in the
+fingers" will feel at home. See "runtime/doc/vi_diff.txt" for differences with
+Vi.
This editor is very useful for editing programs and other plain text files.
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.
+mapped to commands by the user, and the mouse can be used.
-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.
+Vim runs under 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-DOS, MS-Windows 95/98/Me, Amiga
+DOS, Atari MiNT, BeOS, RISC OS and OS/2. These are no longer maintained.
DISTRIBUTION
@@ -35,9 +37,31 @@
an overview of currently available distributions.
+COMPILING
+
+If you obtained a binary distribution you don't need to compile Vim. If you
+obtained a source distribution, all the stuff for compiling Vim is in the
+"src" directory. See src/INSTALL for instructions.
+
+
+INSTALLATION
+
+See one of these files for system-specific instructions. Either in the
+READMEdir directory (in the repository) or the top directory (if you unpack an
+archive):
+
+README_ami.txt Amiga
+README_unix.txt Unix
+README_dos.txt MS-DOS and MS-Windows
+README_mac.txt Macintosh
+README_vms.txt VMS
+
+There are more README_*.txt files, depending on the distribution you used.
+
+
DOCUMENTATION
-The vim tutor is a one hour training course for beginners. Mostly it can be
+The Vim tutor is a one hour training course for beginners. Often it can be
started as "vimtutor". See ":help tutor" for more information.
The best is to use ":help" in Vim. If you don't have an executable yet, read
@@ -74,23 +98,9 @@
http://www.vim.org/sponsor/
-COMPILING
+CONTRIBUTING
-If you obtained a binary distribution you don't need to compile Vim. If you
-obtained a source distribution, all the stuff for compiling Vim is in the
-"src" directory. See src/INSTALL for instructions.
-
-
-INSTALLATION
-
-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_mac.txt Macintosh
-README_vms.txt VMS
-
-There are more README_*.txt files, depending on the distribution you used.
+If you would like to help making Vim better, see the CONTRIBUTING.md file.
INFORMATION
diff --git a/src/version.c b/src/version.c
index 333c0d8..20d64f2 100644
--- a/src/version.c
+++ b/src/version.c
@@ -749,6 +749,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1684,
+/**/
1683,
/**/
1682,