|
 |
d2f7b1e |
To: vim-dev@vim.org
|
|
|
d2f7b1e |
Subject: patch 7.1.048
|
|
|
d2f7b1e |
Fcc: outbox
|
|
|
d2f7b1e |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
d2f7b1e |
Mime-Version: 1.0
|
|
|
d2f7b1e |
Content-Type: text/plain; charset=ISO-8859-1
|
|
|
d2f7b1e |
Content-Transfer-Encoding: 8bit
|
|
|
d2f7b1e |
------------
|
|
|
d2f7b1e |
|
|
|
d2f7b1e |
Patch 7.1.048
|
|
|
d2f7b1e |
Problem: The matchparen plugin doesn't update the match when scrolling with
|
|
|
d2f7b1e |
the mouse wheel. (Ilya Bobir)
|
|
|
d2f7b1e |
Solution: Set the match highlighting for text that can be scrolled into the
|
|
|
d2f7b1e |
viewable area without moving the cursor. (Chris Lubinski)
|
|
|
d2f7b1e |
Files: runtime/plugin/matchparen.vim
|
|
|
d2f7b1e |
|
|
|
d2f7b1e |
|
|
|
d2f7b1e |
*** ../vim-7.1.047/runtime/plugin/matchparen.vim Sun May 6 14:26:16 2007
|
|
|
d2f7b1e |
--- runtime/plugin/matchparen.vim Mon Jul 30 21:14:06 2007
|
|
|
d2f7b1e |
***************
|
|
|
d2f7b1e |
*** 1,6 ****
|
|
|
d2f7b1e |
" Vim plugin for showing matching parens
|
|
|
d2f7b1e |
" Maintainer: Bram Moolenaar <Bram@vim.org>
|
|
|
d2f7b1e |
! " Last Change: 2006 Oct 12
|
|
|
d2f7b1e |
|
|
|
d2f7b1e |
" Exit quickly when:
|
|
|
d2f7b1e |
" - this plugin was already loaded (or disabled)
|
|
|
d2f7b1e |
--- 1,6 ----
|
|
|
d2f7b1e |
" Vim plugin for showing matching parens
|
|
|
d2f7b1e |
" Maintainer: Bram Moolenaar <Bram@vim.org>
|
|
|
d2f7b1e |
! " Last Change: 2007 Jul 30
|
|
|
d2f7b1e |
|
|
|
d2f7b1e |
" Exit quickly when:
|
|
|
d2f7b1e |
" - this plugin was already loaded (or disabled)
|
|
|
d2f7b1e |
***************
|
|
|
d2f7b1e |
*** 62,86 ****
|
|
|
d2f7b1e |
" Figure out the arguments for searchpairpos().
|
|
|
d2f7b1e |
" Restrict the search to visible lines with "stopline".
|
|
|
d2f7b1e |
" And avoid searching very far (e.g., for closed folds and long lines)
|
|
|
d2f7b1e |
if i % 2 == 0
|
|
|
d2f7b1e |
let s_flags = 'nW'
|
|
|
d2f7b1e |
let c2 = plist[i + 1]
|
|
|
d2f7b1e |
if has("byte_offset") && has("syntax_items") && &smc > 0
|
|
|
d2f7b1e |
let stopbyte = min([line2byte("$"), line2byte(".") + col(".") + &smc * 2])
|
|
|
d2f7b1e |
! let stopline = min([line('w$'), byte2line(stopbyte)])
|
|
|
d2f7b1e |
else
|
|
|
d2f7b1e |
! let stopline = min([line('w$'), c_lnum + 100])
|
|
|
d2f7b1e |
endif
|
|
|
d2f7b1e |
else
|
|
|
d2f7b1e |
let s_flags = 'nbW'
|
|
|
d2f7b1e |
let c2 = c
|
|
|
d2f7b1e |
let c = plist[i - 1]
|
|
|
d2f7b1e |
if has("byte_offset") && has("syntax_items") && &smc > 0
|
|
|
d2f7b1e |
let stopbyte = max([1, line2byte(".") + col(".") - &smc * 2])
|
|
|
d2f7b1e |
! let stopline = max([line('w0'), byte2line(stopbyte)])
|
|
|
d2f7b1e |
else
|
|
|
d2f7b1e |
! let stopline = max([line('w0'), c_lnum - 100])
|
|
|
d2f7b1e |
endif
|
|
|
d2f7b1e |
endif
|
|
|
d2f7b1e |
if c == '['
|
|
|
d2f7b1e |
let c = '\['
|
|
|
d2f7b1e |
--- 62,98 ----
|
|
|
d2f7b1e |
" Figure out the arguments for searchpairpos().
|
|
|
d2f7b1e |
" Restrict the search to visible lines with "stopline".
|
|
|
d2f7b1e |
" And avoid searching very far (e.g., for closed folds and long lines)
|
|
|
d2f7b1e |
+ " The "viewable" variables give a range in which we can scroll while keeping
|
|
|
d2f7b1e |
+ " the cursor at the same position
|
|
|
d2f7b1e |
+ " adjustedScrolloff accounts for very large numbers of scrolloff
|
|
|
d2f7b1e |
+ let adjustedScrolloff = min([&scrolloff, (line('w$') - line('w0')) / 2])
|
|
|
d2f7b1e |
+ let bottom_viewable = min([line('$'), c_lnum + &lines - adjustedScrolloff - 2])
|
|
|
d2f7b1e |
+ let top_viewable = max([1, c_lnum-&lines+adjustedScrolloff + 2])
|
|
|
d2f7b1e |
+ " one of these stoplines will be adjusted below, but the current values are
|
|
|
d2f7b1e |
+ " minimal boundaries within the current window
|
|
|
d2f7b1e |
+ let stoplinebottom = line('w$')
|
|
|
d2f7b1e |
+ let stoplinetop = line('w0')
|
|
|
d2f7b1e |
if i % 2 == 0
|
|
|
d2f7b1e |
let s_flags = 'nW'
|
|
|
d2f7b1e |
let c2 = plist[i + 1]
|
|
|
d2f7b1e |
if has("byte_offset") && has("syntax_items") && &smc > 0
|
|
|
d2f7b1e |
let stopbyte = min([line2byte("$"), line2byte(".") + col(".") + &smc * 2])
|
|
|
d2f7b1e |
! let stopline = min([bottom_viewable, byte2line(stopbyte)])
|
|
|
d2f7b1e |
else
|
|
|
d2f7b1e |
! let stopline = min([bottom_viewable, c_lnum + 100])
|
|
|
d2f7b1e |
endif
|
|
|
d2f7b1e |
+ let stoplinebottom = stopline
|
|
|
d2f7b1e |
else
|
|
|
d2f7b1e |
let s_flags = 'nbW'
|
|
|
d2f7b1e |
let c2 = c
|
|
|
d2f7b1e |
let c = plist[i - 1]
|
|
|
d2f7b1e |
if has("byte_offset") && has("syntax_items") && &smc > 0
|
|
|
d2f7b1e |
let stopbyte = max([1, line2byte(".") + col(".") - &smc * 2])
|
|
|
d2f7b1e |
! let stopline = max([top_viewable, byte2line(stopbyte)])
|
|
|
d2f7b1e |
else
|
|
|
d2f7b1e |
! let stopline = max([top_viewable, c_lnum - 100])
|
|
|
d2f7b1e |
endif
|
|
|
d2f7b1e |
+ let stoplinetop = stopline
|
|
|
d2f7b1e |
endif
|
|
|
d2f7b1e |
if c == '['
|
|
|
d2f7b1e |
let c = '\['
|
|
|
d2f7b1e |
***************
|
|
|
d2f7b1e |
*** 106,112 ****
|
|
|
d2f7b1e |
endif
|
|
|
d2f7b1e |
|
|
|
d2f7b1e |
" If a match is found setup match highlighting.
|
|
|
d2f7b1e |
! if m_lnum > 0 && m_lnum >= line('w0') && m_lnum <= line('w$')
|
|
|
d2f7b1e |
exe '3match MatchParen /\(\%' . c_lnum . 'l\%' . (c_col - before) .
|
|
|
d2f7b1e |
\ 'c\)\|\(\%' . m_lnum . 'l\%' . m_col . 'c\)/'
|
|
|
d2f7b1e |
let w:paren_hl_on = 1
|
|
|
d2f7b1e |
--- 118,124 ----
|
|
|
d2f7b1e |
endif
|
|
|
d2f7b1e |
|
|
|
d2f7b1e |
" If a match is found setup match highlighting.
|
|
|
d2f7b1e |
! if m_lnum > 0 && m_lnum >= stoplinetop && m_lnum <= stoplinebottom
|
|
|
d2f7b1e |
exe '3match MatchParen /\(\%' . c_lnum . 'l\%' . (c_col - before) .
|
|
|
d2f7b1e |
\ 'c\)\|\(\%' . m_lnum . 'l\%' . m_col . 'c\)/'
|
|
|
d2f7b1e |
let w:paren_hl_on = 1
|
|
|
d2f7b1e |
*** ../vim-7.1.047/src/version.c Wed Aug 1 15:47:06 2007
|
|
|
d2f7b1e |
--- src/version.c Thu Aug 2 22:59:07 2007
|
|
|
d2f7b1e |
***************
|
|
|
d2f7b1e |
*** 668,669 ****
|
|
|
d2f7b1e |
--- 668,671 ----
|
|
|
d2f7b1e |
{ /* Add new patch number below this line */
|
|
|
d2f7b1e |
+ /**/
|
|
|
d2f7b1e |
+ 48,
|
|
|
d2f7b1e |
/**/
|
|
|
d2f7b1e |
|
|
|
d2f7b1e |
--
|
|
|
d2f7b1e |
hundred-and-one symptoms of being an internet addict:
|
|
|
d2f7b1e |
91. It's Saturday afternoon in the middle of May and you
|
|
|
d2f7b1e |
are on computer.
|
|
|
d2f7b1e |
|
|
|
d2f7b1e |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
d2f7b1e |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
d2f7b1e |
\\\ download, build and distribute -- http://www.A-A-P.org ///
|
|
|
d2f7b1e |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|