|
 |
e68389f |
To: vim_dev@googlegroups.com
|
|
|
e68389f |
Subject: Patch 7.3.829
|
|
|
e68389f |
Fcc: outbox
|
|
|
e68389f |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
e68389f |
Mime-Version: 1.0
|
|
|
e68389f |
Content-Type: text/plain; charset=UTF-8
|
|
|
e68389f |
Content-Transfer-Encoding: 8bit
|
|
|
e68389f |
------------
|
|
|
e68389f |
|
|
|
e68389f |
Patch 7.3.829
|
|
|
e68389f |
Problem: When compiled with the +rightleft feature 'showmatch' also shows a
|
|
|
e68389f |
match for the opening paren. When 'revins' is set the screen may
|
|
|
e68389f |
scroll.
|
|
|
e68389f |
Solution: Only check the opening paren when the +rightleft feature was
|
|
|
e68389f |
enabled. Do not show a match that is not visible. (partly by
|
|
|
e68389f |
Christian Brabandt)
|
|
|
e68389f |
Files: src/search.c
|
|
|
e68389f |
|
|
|
e68389f |
|
|
|
e68389f |
*** ../vim-7.3.828/src/search.c 2013-01-23 16:43:07.000000000 +0100
|
|
|
e68389f |
--- src/search.c 2013-02-20 18:33:33.000000000 +0100
|
|
|
e68389f |
***************
|
|
|
e68389f |
*** 2431,2442 ****
|
|
|
e68389f |
/* 'matchpairs' is "x:y,x:y" */
|
|
|
e68389f |
for (p = curbuf->b_p_mps; *p != NUL; ++p)
|
|
|
e68389f |
{
|
|
|
e68389f |
- if (PTR2CHAR(p) == c
|
|
|
e68389f |
#ifdef FEAT_RIGHTLEFT
|
|
|
e68389f |
! && (curwin->w_p_rl ^ p_ri)
|
|
|
e68389f |
! #endif
|
|
|
e68389f |
! )
|
|
|
e68389f |
break;
|
|
|
e68389f |
p += MB_PTR2LEN(p) + 1;
|
|
|
e68389f |
if (PTR2CHAR(p) == c
|
|
|
e68389f |
#ifdef FEAT_RIGHTLEFT
|
|
|
e68389f |
--- 2431,2440 ----
|
|
|
e68389f |
/* 'matchpairs' is "x:y,x:y" */
|
|
|
e68389f |
for (p = curbuf->b_p_mps; *p != NUL; ++p)
|
|
|
e68389f |
{
|
|
|
e68389f |
#ifdef FEAT_RIGHTLEFT
|
|
|
e68389f |
! if (PTR2CHAR(p) == c && (curwin->w_p_rl ^ p_ri))
|
|
|
e68389f |
break;
|
|
|
e68389f |
+ #endif
|
|
|
e68389f |
p += MB_PTR2LEN(p) + 1;
|
|
|
e68389f |
if (PTR2CHAR(p) == c
|
|
|
e68389f |
#ifdef FEAT_RIGHTLEFT
|
|
|
e68389f |
***************
|
|
|
e68389f |
*** 2451,2457 ****
|
|
|
e68389f |
|
|
|
e68389f |
if ((lpos = findmatch(NULL, NUL)) == NULL) /* no match, so beep */
|
|
|
e68389f |
vim_beep();
|
|
|
e68389f |
! else if (lpos->lnum >= curwin->w_topline)
|
|
|
e68389f |
{
|
|
|
e68389f |
if (!curwin->w_p_wrap)
|
|
|
e68389f |
getvcol(curwin, lpos, NULL, &vcol, NULL);
|
|
|
e68389f |
--- 2449,2455 ----
|
|
|
e68389f |
|
|
|
e68389f |
if ((lpos = findmatch(NULL, NUL)) == NULL) /* no match, so beep */
|
|
|
e68389f |
vim_beep();
|
|
|
e68389f |
! else if (lpos->lnum >= curwin->w_topline && lpos->lnum < curwin->w_botline)
|
|
|
e68389f |
{
|
|
|
e68389f |
if (!curwin->w_p_wrap)
|
|
|
e68389f |
getvcol(curwin, lpos, NULL, &vcol, NULL);
|
|
|
e68389f |
*** ../vim-7.3.828/src/version.c 2013-02-20 17:58:01.000000000 +0100
|
|
|
e68389f |
--- src/version.c 2013-02-20 18:35:12.000000000 +0100
|
|
|
e68389f |
***************
|
|
|
e68389f |
*** 730,731 ****
|
|
|
e68389f |
--- 730,733 ----
|
|
|
e68389f |
{ /* Add new patch number below this line */
|
|
|
e68389f |
+ /**/
|
|
|
e68389f |
+ 829,
|
|
|
e68389f |
/**/
|
|
|
e68389f |
|
|
|
e68389f |
--
|
|
|
e68389f |
BLACK KNIGHT: The Black Knight always triumphs. Have at you!
|
|
|
e68389f |
ARTHUR takes his last leg off. The BLACK KNIGHT's body lands upright.
|
|
|
e68389f |
BLACK KNIGHT: All right, we'll call it a draw.
|
|
|
e68389f |
"Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
|
|
|
e68389f |
|
|
|
e68389f |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
e68389f |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
e68389f |
\\\ an exciting new programming language -- http://www.Zimbu.org ///
|
|
|
e68389f |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|