patch 7.4.899

Problem:    README file is not optimal.
Solution:   Move buttons, update some text. (closes #460)

diff --git a/README.md b/README.md
index e66e8b549ff9ff8f66623f33cf4cba01810bb260..cdf2d8b5f19a6ba4922e75cf21a61c4c431505b4 100644 (file)
--- 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 e706d750b5afd6f405b4de57e67595c26ac5d1d1..d9fc6464db5ef10a1fd772ae2669e4353c7aaa14 100644 (file)
--- 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 a2aec2cd58ece2fb0bccff03394dff115ada70f3..d866e7616d9cdb9aec7e121391b6fa96f596e181 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 */
+/**/
+    899,
 /**/
     898,
 /**/