summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2006-05-13 12:48:30 +0000
committerBram Moolenaar <Bram@vim.org>2006-05-13 12:48:30 +0000
commit2347f062fb98b1c0556be1e7cfb374c67fb57651 (patch)
treea3f924560b462a19558ca66db8497cc92b643950
parent2e97890d67d0db2021eb9e79ee81c713e8b3532a (diff)
downloadvim-git-2347f062fb98b1c0556be1e7cfb374c67fb57651.tar.gz
updated for version 7.0-012v7.0.012
-rw-r--r--runtime/plugin/matchparen.vim6
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 3 deletions
diff --git a/runtime/plugin/matchparen.vim b/runtime/plugin/matchparen.vim
index 7307d6a52..81f00c146 100644
--- a/runtime/plugin/matchparen.vim
+++ b/runtime/plugin/matchparen.vim
@@ -1,6 +1,6 @@
" Vim plugin for showing matching parens
" Maintainer: Bram Moolenaar <Bram@vim.org>
-" Last Change: 2006 Apr 27
+" Last Change: 2006 May 11
" Exit quickly when:
" - this plugin was already loaded (or disabled)
@@ -90,7 +90,7 @@ function! s:Highlight_Matching_Pair()
" Find the match. When it was just before the cursor move it there for a
" moment.
if before > 0
- let save_cursor = getpos('.')
+ let save_cursor = winsaveview()
call cursor(c_lnum, c_col - before)
endif
@@ -102,7 +102,7 @@ function! s:Highlight_Matching_Pair()
let [m_lnum, m_col] = searchpairpos(c, '', c2, s_flags, s_skip, stopline)
if before > 0
- call setpos('.', save_cursor)
+ call winrestview(save_cursor)
endif
" If a match is found setup match highlighting.
diff --git a/src/version.c b/src/version.c
index ff1671f08..00639cfd7 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 */
/**/
+ 12,
+/**/
11,
/**/
10,