thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

updated for version 7.1-048

Browse Source
This commit is contained in:
Bram Moolenaar
2007-08-02 21:00:50 +00:00
parent 150cc27040
commit ef04586d9f
2 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
runtime/plugin/matchparen.vim
View File

@@ -1,6 +1,6 @@
" Vim plugin for showing matching parens " Vim plugin for showing matching parens
" Maintainer: Bram Moolenaar <Bram@vim.org> " Maintainer: Bram Moolenaar <Bram@vim.org>
" Last Change: 2006 Oct 12 " Last Change: 2007 Jul 30
" Exit quickly when: " Exit quickly when:
" - this plugin was already loaded (or disabled) " - this plugin was already loaded (or disabled)
@@ -62,25 +62,37 @@ function! s:Highlight_Matching_Pair()
" Figure out the arguments for searchpairpos(). " Figure out the arguments for searchpairpos().
" Restrict the search to visible lines with "stopline". " Restrict the search to visible lines with "stopline".
" And avoid searching very far (e.g., for closed folds and long lines) " And avoid searching very far (e.g., for closed folds and long lines)
" The "viewable" variables give a range in which we can scroll while keeping
" the cursor at the same position
" adjustedScrolloff accounts for very large numbers of scrolloff
let adjustedScrolloff = min([&scrolloff, (line('w$') - line('w0')) / 2])
let bottom_viewable = min([line('$'), c_lnum + &lines - adjustedScrolloff - 2])
let top_viewable = max([1, c_lnum-&lines+adjustedScrolloff + 2])
" one of these stoplines will be adjusted below, but the current values are
" minimal boundaries within the current window
let stoplinebottom = line('w$')
let stoplinetop = line('w0')
if i % 2 == 0 if i % 2 == 0
let s_flags = 'nW' let s_flags = 'nW'
let c2 = plist[i + 1] let c2 = plist[i + 1]
if has("byte_offset") && has("syntax_items") && &smc > 0 if has("byte_offset") && has("syntax_items") && &smc > 0
let stopbyte = min([line2byte("$"), line2byte(".") + col(".") + &smc * 2]) let stopbyte = min([line2byte("$"), line2byte(".") + col(".") + &smc * 2])
let stopline = min([line('w$'), byte2line(stopbyte)]) let stopline = min([bottom_viewable, byte2line(stopbyte)])
else else
let stopline = min([line('w$'), c_lnum + 100]) let stopline = min([bottom_viewable, c_lnum + 100])
endif endif
let stoplinebottom = stopline
else else
let s_flags = 'nbW' let s_flags = 'nbW'
let c2 = c let c2 = c
let c = plist[i - 1] let c = plist[i - 1]
if has("byte_offset") && has("syntax_items") && &smc > 0 if has("byte_offset") && has("syntax_items") && &smc > 0
let stopbyte = max([1, line2byte(".") + col(".") - &smc * 2]) let stopbyte = max([1, line2byte(".") + col(".") - &smc * 2])
let stopline = max([line('w0'), byte2line(stopbyte)]) let stopline = max([top_viewable, byte2line(stopbyte)])
else else
let stopline = max([line('w0'), c_lnum - 100]) let stopline = max([top_viewable, c_lnum - 100])
endif endif
let stoplinetop = stopline
endif endif
if c == '[' if c == '['
let c = '\[' let c = '\['
@@ -106,7 +118,7 @@ function! s:Highlight_Matching_Pair()
endif endif
" If a match is found setup match highlighting. " If a match is found setup match highlighting.
if m_lnum > 0 && m_lnum >= line('w0') && m_lnum <= line('w$') if m_lnum > 0 && m_lnum >= stoplinetop && m_lnum <= stoplinebottom
exe '3match MatchParen /\(\%' . c_lnum . 'l\%' . (c_col - before) . exe '3match MatchParen /\(\%' . c_lnum . 'l\%' . (c_col - before) .
\ 'c\)\|\(\%' . m_lnum . 'l\%' . m_col . 'c\)/' \ 'c\)\|\(\%' . m_lnum . 'l\%' . m_col . 'c\)/'
let w:paren_hl_on = 1 let w:paren_hl_on = 1

2
src/version.c
View File

@@ -666,6 +666,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
48,
/**/ /**/
47, 47,
/**/ /**/