summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2015-10-25 13:55:00 +0100
committerBram Moolenaar <Bram@vim.org>2015-10-25 13:55:00 +0100
commitc92399f4ee6d0289dbe5d708d14a84e32f617bd5 (patch)
tree3e05760fa1c2c00b8046d31f776c95ad149709d6
parent60cce2fb736c8ff6fdb9603f502d3c15f1f7a25d (diff)
downloadvim-git-7.4.899.tar.gz
patch 7.4.899v7.4.899
Problem: README file is not optimal. Solution: Move buttons, update some text. (closes #460)
-rw-r--r--README.md11
-rw-r--r--README.txt6
-rw-r--r--src/version.c2
3 files changed, 14 insertions, 5 deletions
diff --git a/README.md b/README.md
index e66e8b549..cdf2d8b5f 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,9 @@
`README.md` for version 7.4 of Vim: Vi IMproved.
+[![Build Status](https://travis-ci.org/vim/vim.svg?branch=master)](https://travis-ci.org/vim/vim)
+[![Coverage Status](https://coveralls.io/repos/vim/vim/badge.svg?branch=master&service=github)](https://coveralls.io/github/vim/vim?branch=master)
-## What is VIM ##
+## 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,
@@ -21,6 +23,10 @@ UNIX. Porting to other systems should not be very difficult.
## Distribution ##
+You can often use your favorite package manager to install Vim. On Mac and
+Linux a small version of Vim is pre-installed, you still need to install Vim
+if you want more features.
+
There are separate distributions for Unix, PC, Amiga and some other systems.
This `README.md` file comes with the runtime archive. It includes the
documentation, syntax files and other files that are used at runtime. To run
@@ -29,9 +35,6 @@ Which one you need depends on the system you want to run it on and whether you
want or must compile it yourself. Check http://www.vim.org/download.php for
an overview of currently available distributions.
-[![Build Status](https://travis-ci.org/vim/vim.svg?branch=master)](https://travis-ci.org/vim/vim)
-[![Coverage Status](https://coveralls.io/repos/vim/vim/badge.svg?branch=master&service=github)](https://coveralls.io/github/vim/vim?branch=master)
-
## Documentation ##
diff --git a/README.txt b/README.txt
index e706d750b..d9fc6464d 100644
--- a/README.txt
+++ b/README.txt
@@ -1,7 +1,7 @@
README.txt for version 7.4 of Vim: Vi IMproved.
-WHAT IS VIM
+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,
@@ -21,6 +21,10 @@ UNIX. Porting to other systems should not be very difficult.
DISTRIBUTION
+You can often use your favorite package manager to install Vim. On Mac and
+Linux a small version of Vim is pre-installed, you still need to install Vim
+if you want more features.
+
There are separate distributions for Unix, PC, Amiga and some other systems.
This README.txt file comes with the runtime archive. It includes the
documentation, syntax files and other files that are used at runtime. To run
diff --git a/src/version.c b/src/version.c
index a2aec2cd5..d866e7616 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 */
/**/
+ 899,
+/**/
898,
/**/
897,