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 1968ce9be7..45a5393d32 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 Jul 29 +" Last change: 2016 Aug 20 " " This is loaded if no vimrc file was found. " Except when Vim is run with "-u NONE" or "-C". @@ -25,6 +25,9 @@ set ruler " show the cursor position all the time set showcmd " display incomplete commands set wildmenu " display completion matches in a status line +set ttimeout " time out for key codes +set ttimeoutlen=100 " wait up to 100ms after Esc for special key + " Show @@@ in the last line if it is truncated. set display=truncate diff --git a/src/version.c b/src/version.c index c2a308dca1..02316bfa47 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 */ /**/ + 2232, +/**/ 2231, /**/ 2230, |