patch 7.4.2232

Problem:    The default ttimeoutlen is very long.
Solution:   Use "100". (Hirohito Higashi)

diff --git a/runtime/defaults.vim b/runtime/defaults.vim
index 1968ce9be7e95395c55bbd40b9f437c700a84676..45a5393d3241dcee509264a0e180e48bb54557a7 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 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 c2a308dca196a4c1ed6c7ab80ea63d82c33066d2..02316bfa47d6718cdbd7f98b7ffe1e25382377d5 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 */
+/**/
+    2232,
 /**/
     2231,
 /**/