diff options
| author | Bram Moolenaar <Bram@vim.org> | 2006-04-27 21:40:34 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2006-04-27 21:40:34 +0000 |
| commit | 25e2c9e3e6a2eaafd7d21a6f4e70c836d7888d8d (patch) | |
| tree | a9a85b31c08dd9ede86141d79e91e06b87512d2d /runtime/plugin | |
| parent | f193fffd16563cfbe7c02a21e19c8bb11707581d (diff) | |
| download | vim-git-25e2c9e3e6a2eaafd7d21a6f4e70c836d7888d8d.tar.gz | |
updated for version 7.0f03
Diffstat (limited to 'runtime/plugin')
| -rw-r--r-- | runtime/plugin/matchparen.vim | 14 | ||||
| -rw-r--r-- | runtime/plugin/vimballPlugin.vim | 2 |
2 files changed, 9 insertions, 7 deletions
diff --git a/runtime/plugin/matchparen.vim b/runtime/plugin/matchparen.vim index a3475f084..7307d6a52 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 04 +" Last Change: 2006 Apr 27 " Exit quickly when: " - this plugin was already loaded (or disabled) @@ -87,18 +87,20 @@ function! s:Highlight_Matching_Pair() let c2 = '\]' endif - " When not in a string or comment ignore matches inside them. - let s_skip ='synIDattr(synID(line("."), col(".") - before, 0), "name") ' . - \ '=~? "string\\|comment"' - execute 'if' s_skip '| let s_skip = 0 | endif' - " Find the match. When it was just before the cursor move it there for a " moment. if before > 0 let save_cursor = getpos('.') call cursor(c_lnum, c_col - before) endif + + " When not in a string or comment ignore matches inside them. + let s_skip ='synIDattr(synID(line("."), col("."), 0), "name") ' . + \ '=~? "string\\|comment"' + execute 'if' s_skip '| let s_skip = 0 | endif' + let [m_lnum, m_col] = searchpairpos(c, '', c2, s_flags, s_skip, stopline) + if before > 0 call setpos('.', save_cursor) endif diff --git a/runtime/plugin/vimballPlugin.vim b/runtime/plugin/vimballPlugin.vim index 95c06c3ec..32faedaa6 100644 --- a/runtime/plugin/vimballPlugin.vim +++ b/runtime/plugin/vimballPlugin.vim @@ -12,7 +12,7 @@ if &cp || exists("g:loaded_vimball") || exists("g:loaded_vimballplugin") finish endif -let g:loaded_vimballplugin= 1 +let g:loaded_vimballplugin = 1 let s:keepcpo= &cpo set cpo&vim |