|
 |
22c937 |
To: vim_dev@googlegroups.com
|
|
|
22c937 |
Subject: Patch 7.4.545
|
|
|
22c937 |
Fcc: outbox
|
|
|
22c937 |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
22c937 |
Mime-Version: 1.0
|
|
|
22c937 |
Content-Type: text/plain; charset=UTF-8
|
|
|
22c937 |
Content-Transfer-Encoding: 8bit
|
|
|
22c937 |
------------
|
|
|
22c937 |
|
|
|
22c937 |
Patch 7.4.545
|
|
|
22c937 |
Problem: Highlighting for multi-line matches is not correct.
|
|
|
22c937 |
Solution: Stop highlight at the end of the match. (Hirohito Higashi)
|
|
|
22c937 |
Files: src/screen.c
|
|
|
22c937 |
|
|
|
22c937 |
|
|
|
22c937 |
*** ../vim-7.4.544/src/screen.c 2014-11-27 13:37:07.399540002 +0100
|
|
|
22c937 |
--- src/screen.c 2014-12-13 03:30:31.520358269 +0100
|
|
|
22c937 |
***************
|
|
|
22c937 |
*** 3864,3872 ****
|
|
|
22c937 |
&& v >= (long)shl->startcol
|
|
|
22c937 |
&& v < (long)shl->endcol)
|
|
|
22c937 |
{
|
|
|
22c937 |
shl->attr_cur = shl->attr;
|
|
|
22c937 |
}
|
|
|
22c937 |
! else if (v >= (long)shl->endcol && shl->lnum == lnum)
|
|
|
22c937 |
{
|
|
|
22c937 |
shl->attr_cur = 0;
|
|
|
22c937 |
next_search_hl(wp, shl, lnum, (colnr_T)v, cur);
|
|
|
22c937 |
--- 3864,3878 ----
|
|
|
22c937 |
&& v >= (long)shl->startcol
|
|
|
22c937 |
&& v < (long)shl->endcol)
|
|
|
22c937 |
{
|
|
|
22c937 |
+ #ifdef FEAT_MBYTE
|
|
|
22c937 |
+ int tmp_col = v + MB_PTR2LEN(ptr);
|
|
|
22c937 |
+
|
|
|
22c937 |
+ if (shl->endcol < tmp_col)
|
|
|
22c937 |
+ shl->endcol = tmp_col;
|
|
|
22c937 |
+ #endif
|
|
|
22c937 |
shl->attr_cur = shl->attr;
|
|
|
22c937 |
}
|
|
|
22c937 |
! else if (v == (long)shl->endcol)
|
|
|
22c937 |
{
|
|
|
22c937 |
shl->attr_cur = 0;
|
|
|
22c937 |
next_search_hl(wp, shl, lnum, (colnr_T)v, cur);
|
|
|
22c937 |
*** ../vim-7.4.544/src/version.c 2014-12-13 03:20:10.543067406 +0100
|
|
|
22c937 |
--- src/version.c 2014-12-13 03:36:19.704599650 +0100
|
|
|
22c937 |
***************
|
|
|
22c937 |
*** 743,744 ****
|
|
|
22c937 |
--- 743,746 ----
|
|
|
22c937 |
{ /* Add new patch number below this line */
|
|
|
22c937 |
+ /**/
|
|
|
22c937 |
+ 545,
|
|
|
22c937 |
/**/
|
|
|
22c937 |
|
|
|
22c937 |
--
|
|
|
22c937 |
You can test a person's importance in the organization by asking how much RAM
|
|
|
22c937 |
his computer has. Anybody who knows the answer to that question is not a
|
|
|
22c937 |
decision-maker.
|
|
|
22c937 |
(Scott Adams - The Dilbert principle)
|
|
|
22c937 |
|
|
|
22c937 |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
22c937 |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
22c937 |
\\\ an exciting new programming language -- http://www.Zimbu.org ///
|
|
|
22c937 |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|