patch 7.4.2278

Problem:    New users have no idea of the 'scrolloff' option.
Solution:   Set 'scrolloff' in defaults.vim.

diff --git a/runtime/defaults.vim b/runtime/defaults.vim
index 023d64020846422eb5ff0ccd2cc0fdade86cfaa9..0ff834a2a042301ac2c2ca66982105dc24c8f5ff 100644 (file)
--- a/runtime/defaults.vim
+++ b/runtime/defaults.vim
@@ -1,7 +1,7 @@
 " The default vimrc file.
 "
 " Maintainer:  Bram Moolenaar <Bram@vim.org>
-" Last change: 2016 Aug 21
+" Last change: 2016 Aug 28
 "
 " This is loaded if no vimrc file was found.
 " Except when Vim is run with "-u NONE" or "-C".
@@ -31,6 +31,9 @@ set ttimeoutlen=100   " wait up to 100ms after Esc for special key
 " Show @@@ in the last line if it is truncated.
 set display=truncate
 
+" Show a few lines of context around the cursor.
+set scrolloff=5
+
 " Do incremental searching when it's possible to timeout.
 if has('reltime')
   set incsearch

diff --git a/src/version.c b/src/version.c
index 0be0faa5ca2d45bd997d00f403d5c5d1f9ceec80..6f4be8e347e163e60bb52b4a8adabbde77788496 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -763,6 +763,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2278,
 /**/
     2277,
 /**/