|
 |
d6ba96 |
To: vim_dev@googlegroups.com
|
|
|
d6ba96 |
Subject: Patch 7.4.532
|
|
|
d6ba96 |
Fcc: outbox
|
|
|
d6ba96 |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
d6ba96 |
Mime-Version: 1.0
|
|
|
d6ba96 |
Content-Type: text/plain; charset=UTF-8
|
|
|
d6ba96 |
Content-Transfer-Encoding: 8bit
|
|
|
d6ba96 |
------------
|
|
|
d6ba96 |
|
|
|
d6ba96 |
Patch 7.4.532
|
|
|
d6ba96 |
Problem: When using 'incsearch' "2/pattern/e" highlights the first match.
|
|
|
d6ba96 |
Solution: Move the code to set extra_col inside the loop for count. (Ozaki
|
|
|
d6ba96 |
Kiichi)
|
|
|
d6ba96 |
Files: src/search.c
|
|
|
d6ba96 |
|
|
|
d6ba96 |
|
|
|
d6ba96 |
*** ../vim-7.4.531/src/search.c 2014-06-17 13:50:06.148087184 +0200
|
|
|
d6ba96 |
--- src/search.c 2014-11-27 17:21:49.579489220 +0100
|
|
|
d6ba96 |
***************
|
|
|
d6ba96 |
*** 552,557 ****
|
|
|
d6ba96 |
--- 552,558 ----
|
|
|
d6ba96 |
int match_ok;
|
|
|
d6ba96 |
long nmatched;
|
|
|
d6ba96 |
int submatch = 0;
|
|
|
d6ba96 |
+ int first_match = TRUE;
|
|
|
d6ba96 |
int save_called_emsg = called_emsg;
|
|
|
d6ba96 |
#ifdef FEAT_SEARCH_EXTRA
|
|
|
d6ba96 |
int break_loop = FALSE;
|
|
|
d6ba96 |
***************
|
|
|
d6ba96 |
*** 565,597 ****
|
|
|
d6ba96 |
return FAIL;
|
|
|
d6ba96 |
}
|
|
|
d6ba96 |
|
|
|
d6ba96 |
- /* When not accepting a match at the start position set "extra_col" to a
|
|
|
d6ba96 |
- * non-zero value. Don't do that when starting at MAXCOL, since MAXCOL +
|
|
|
d6ba96 |
- * 1 is zero. */
|
|
|
d6ba96 |
- if ((options & SEARCH_START) || pos->col == MAXCOL)
|
|
|
d6ba96 |
- extra_col = 0;
|
|
|
d6ba96 |
- #ifdef FEAT_MBYTE
|
|
|
d6ba96 |
- /* Watch out for the "col" being MAXCOL - 2, used in a closed fold. */
|
|
|
d6ba96 |
- else if (dir != BACKWARD && has_mbyte
|
|
|
d6ba96 |
- && pos->lnum >= 1 && pos->lnum <= buf->b_ml.ml_line_count
|
|
|
d6ba96 |
- && pos->col < MAXCOL - 2)
|
|
|
d6ba96 |
- {
|
|
|
d6ba96 |
- ptr = ml_get_buf(buf, pos->lnum, FALSE) + pos->col;
|
|
|
d6ba96 |
- if (*ptr == NUL)
|
|
|
d6ba96 |
- extra_col = 1;
|
|
|
d6ba96 |
- else
|
|
|
d6ba96 |
- extra_col = (*mb_ptr2len)(ptr);
|
|
|
d6ba96 |
- }
|
|
|
d6ba96 |
- #endif
|
|
|
d6ba96 |
- else
|
|
|
d6ba96 |
- extra_col = 1;
|
|
|
d6ba96 |
-
|
|
|
d6ba96 |
/*
|
|
|
d6ba96 |
* find the string
|
|
|
d6ba96 |
*/
|
|
|
d6ba96 |
called_emsg = FALSE;
|
|
|
d6ba96 |
do /* loop for count */
|
|
|
d6ba96 |
{
|
|
|
d6ba96 |
start_pos = *pos; /* remember start pos for detecting no match */
|
|
|
d6ba96 |
found = 0; /* default: not found */
|
|
|
d6ba96 |
at_first_line = TRUE; /* default: start in first line */
|
|
|
d6ba96 |
--- 566,598 ----
|
|
|
d6ba96 |
return FAIL;
|
|
|
d6ba96 |
}
|
|
|
d6ba96 |
|
|
|
d6ba96 |
/*
|
|
|
d6ba96 |
* find the string
|
|
|
d6ba96 |
*/
|
|
|
d6ba96 |
called_emsg = FALSE;
|
|
|
d6ba96 |
do /* loop for count */
|
|
|
d6ba96 |
{
|
|
|
d6ba96 |
+ /* When not accepting a match at the start position set "extra_col" to
|
|
|
d6ba96 |
+ * a non-zero value. Don't do that when starting at MAXCOL, since
|
|
|
d6ba96 |
+ * MAXCOL + 1 is zero. */
|
|
|
d6ba96 |
+ if ((options & SEARCH_START) || pos->col == MAXCOL)
|
|
|
d6ba96 |
+ extra_col = 0;
|
|
|
d6ba96 |
+ #ifdef FEAT_MBYTE
|
|
|
d6ba96 |
+ /* Watch out for the "col" being MAXCOL - 2, used in a closed fold. */
|
|
|
d6ba96 |
+ else if (dir != BACKWARD && has_mbyte
|
|
|
d6ba96 |
+ && pos->lnum >= 1 && pos->lnum <= buf->b_ml.ml_line_count
|
|
|
d6ba96 |
+ && pos->col < MAXCOL - 2)
|
|
|
d6ba96 |
+ {
|
|
|
d6ba96 |
+ ptr = ml_get_buf(buf, pos->lnum, FALSE) + pos->col;
|
|
|
d6ba96 |
+ if (*ptr == NUL)
|
|
|
d6ba96 |
+ extra_col = 1;
|
|
|
d6ba96 |
+ else
|
|
|
d6ba96 |
+ extra_col = (*mb_ptr2len)(ptr);
|
|
|
d6ba96 |
+ }
|
|
|
d6ba96 |
+ #endif
|
|
|
d6ba96 |
+ else
|
|
|
d6ba96 |
+ extra_col = 1;
|
|
|
d6ba96 |
+
|
|
|
d6ba96 |
start_pos = *pos; /* remember start pos for detecting no match */
|
|
|
d6ba96 |
found = 0; /* default: not found */
|
|
|
d6ba96 |
at_first_line = TRUE; /* default: start in first line */
|
|
|
d6ba96 |
***************
|
|
|
d6ba96 |
*** 677,683 ****
|
|
|
d6ba96 |
* otherwise "/$" will get stuck on end of line.
|
|
|
d6ba96 |
*/
|
|
|
d6ba96 |
while (matchpos.lnum == 0
|
|
|
d6ba96 |
! && ((options & SEARCH_END)
|
|
|
d6ba96 |
? (nmatched == 1
|
|
|
d6ba96 |
&& (int)endpos.col - 1
|
|
|
d6ba96 |
< (int)start_pos.col + extra_col)
|
|
|
d6ba96 |
--- 678,684 ----
|
|
|
d6ba96 |
* otherwise "/$" will get stuck on end of line.
|
|
|
d6ba96 |
*/
|
|
|
d6ba96 |
while (matchpos.lnum == 0
|
|
|
d6ba96 |
! && ((options & SEARCH_END) && first_match
|
|
|
d6ba96 |
? (nmatched == 1
|
|
|
d6ba96 |
&& (int)endpos.col - 1
|
|
|
d6ba96 |
< (int)start_pos.col + extra_col)
|
|
|
d6ba96 |
***************
|
|
|
d6ba96 |
*** 908,913 ****
|
|
|
d6ba96 |
--- 909,915 ----
|
|
|
d6ba96 |
pos->coladd = 0;
|
|
|
d6ba96 |
#endif
|
|
|
d6ba96 |
found = 1;
|
|
|
d6ba96 |
+ first_match = FALSE;
|
|
|
d6ba96 |
|
|
|
d6ba96 |
/* Set variables used for 'incsearch' highlighting. */
|
|
|
d6ba96 |
search_match_lines = endpos.lnum - matchpos.lnum;
|
|
|
d6ba96 |
*** ../vim-7.4.531/src/version.c 2014-11-27 16:38:07.652261234 +0100
|
|
|
d6ba96 |
--- src/version.c 2014-11-27 17:29:13.762616760 +0100
|
|
|
d6ba96 |
***************
|
|
|
d6ba96 |
*** 743,744 ****
|
|
|
d6ba96 |
--- 743,746 ----
|
|
|
d6ba96 |
{ /* Add new patch number below this line */
|
|
|
d6ba96 |
+ /**/
|
|
|
d6ba96 |
+ 532,
|
|
|
d6ba96 |
/**/
|
|
|
d6ba96 |
|
|
|
d6ba96 |
--
|
|
|
d6ba96 |
The most powerful force in the universe is gossip.
|
|
|
d6ba96 |
|
|
|
d6ba96 |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
d6ba96 |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
d6ba96 |
\\\ an exciting new programming language -- http://www.Zimbu.org ///
|
|
|
d6ba96 |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|