summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2008-06-04 12:29:14 +0000
committerBram Moolenaar <Bram@vim.org>2008-06-04 12:29:14 +0000
commit63ce8c03d621f440fa4838cce6a2238fdf81748e (patch)
tree9436c200d6b4213a028f753fdeed7379c51afb51
parent2c45e945a304ed91da0d958445136e2ba1740259 (diff)
downloadvim-git-63ce8c03d621f440fa4838cce6a2238fdf81748e.tar.gz
updated for version 7.1-308v7.1.308
-rw-r--r--runtime/optwin.vim8
-rw-r--r--src/version.c2
2 files changed, 8 insertions, 2 deletions
diff --git a/runtime/optwin.vim b/runtime/optwin.vim
index c0cbf2b6e..7392b53bd 100644
--- a/runtime/optwin.vim
+++ b/runtime/optwin.vim
@@ -1,7 +1,7 @@
" These commands create the option window.
"
" Maintainer: Bram Moolenaar <Bram@vim.org>
-" Last Change: 2006 Oct 10
+" Last Change: 2008 May 12
" If there already is an option window, jump to that one.
if bufwinnr("option-window") > 0
@@ -147,7 +147,7 @@ endwhile
" Open the window
new option-window
-setlocal ts=15 tw=0
+setlocal ts=15 tw=0 noro
" Insert help and a "set" command for each option.
call append(0, '" Each "set" line shows the current value of an option (on the left).')
@@ -350,6 +350,10 @@ call append("$", "lines\tnumber of lines in the display")
call append("$", " \tset lines=" . &lines)
call append("$", "lazyredraw\tdon't redraw while executing macros")
call <SID>BinOptionG("lz", &lz)
+if has("reltime")
+ call append("$", "redrawtime\ttimeout for 'hlsearch' and :match highlighting in msec")
+ call append("$", " \tset rdt=" . &rdt)
+endif
call append("$", "writedelay\tdelay in msec for each char written to the display")
call append("$", "\t(for debugging)")
call append("$", " \tset wd=" . &wd)
diff --git a/src/version.c b/src/version.c
index 2d03c4b53..0a07211cb 100644
--- a/src/version.c
+++ b/src/version.c
@@ -667,6 +667,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 308,
+/**/
307,
/**/
306,