# HG changeset patch # User Christian Brabandt # Date 1445778004 -3600 # Node ID c4d677c50b9b07232cf1d4295c94b45591ab1395 # Parent 30042ddff5038734cdeecb007d24967f897e0899 commit https://github.com/vim/vim/commit/c92399f4ee6d0289dbe5d708d14a84e32f617bd5 Author: Bram Moolenaar Date: Sun Oct 25 13:55:00 2015 +0100 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 --- 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 n ## 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 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 --- 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 n 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 --- 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,