diff options
-rw-r--r-- | runtime/defaults.vim | 5 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/runtime/defaults.vim b/runtime/defaults.vim index 023d64020..0ff834a2a 100644 --- 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 0be0faa5c..6f4be8e34 100644 --- a/src/version.c +++ b/src/version.c @@ -764,6 +764,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2278, +/**/ 2277, /**/ 2276, |