Mercurial > vim
diff src/textobject.c @ 25437:d4a710f06f02 v8.2.3255
patch 8.2.3255: ci" finds following string but ci< and others don't
Commit: https://github.com/vim/vim/commit/b9115da4bec5e6cfff69da85cc47c42dd67e42e4
Author: Connor Lane Smith <cls@lubutu.com>
Date: Sat Jul 31 13:31:42 2021 +0200
patch 8.2.3255: ci" finds following string but ci< and others don't
Problem: ci" finds following string but ci< and others don't.
Solution: When not inside an object find the start. (Connor Lane Smit,
closes #8670)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sat, 31 Jul 2021 13:45:03 +0200 |
| parents | 3ac0ef0578ef |
| children | 1ab5add6f4e8 |
line wrap: on
line diff
--- a/src/textobject.c +++ b/src/textobject.c @@ -1079,12 +1079,25 @@ current_block( */ save_cpo = p_cpo; p_cpo = (char_u *)(vim_strchr(p_cpo, CPO_MATCHBSL) != NULL ? "%M" : "%"); - while (count-- > 0) + if ((pos = findmatch(NULL, what)) != NULL) { - if ((pos = findmatch(NULL, what)) == NULL) - break; - curwin->w_cursor = *pos; - start_pos = *pos; // the findmatch for end_pos will overwrite *pos + while (count-- > 0) + { + if ((pos = findmatch(NULL, what)) == NULL) + break; + curwin->w_cursor = *pos; + start_pos = *pos; // the findmatch for end_pos will overwrite *pos + } + } + else + { + while (count-- > 0) + { + if ((pos = findmatchlimit(NULL, what, FM_FORWARD, 0)) == NULL) + break; + curwin->w_cursor = *pos; + start_pos = *pos; // the findmatch for end_pos will overwrite *pos + } } p_cpo = save_cpo;