thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.2.0295: highlighting for :s wrong when using different separator

Browse Source 
Problem:    Highlighting for :s wrong when using different separator.
Solution:   Use separat argument for search direction and separator. (Rob
            Pilling, closes #5665)
This commit is contained in:
Bram Moolenaar
2020-02-21 21:30:52 +01:00
parent 5b1c8fe3d5
commit c036e87bd7
12 changed files with 61 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/tag.c
View File

@@ -3543,7 +3543,7 @@ jumpto_tag(
else
// start search before first line
curwin->w_cursor.lnum = 0;
if (do_search(NULL, pbuf[0], pbuf + 1, (long)1,
if (do_search(NULL, pbuf[0], pbuf[0], pbuf + 1, (long)1,
search_options, NULL))
retval = OK;
else
@@ -3555,7 +3555,7 @@ jumpto_tag(
* try again, ignore case now
*/
p_ic = TRUE;
if (!do_search(NULL, pbuf[0], pbuf + 1, (long)1,
if (!do_search(NULL, pbuf[0], pbuf[0], pbuf + 1, (long)1,
search_options, NULL))
{
/*
@@ -3566,13 +3566,13 @@ jumpto_tag(
cc = *tagp.tagname_end;
*tagp.tagname_end = NUL;
sprintf((char *)pbuf, "^%s\\s\\*(", tagp.tagname);
if (!do_search(NULL, '/', pbuf, (long)1,
if (!do_search(NULL, '/', '/', pbuf, (long)1,
search_options, NULL))
{
// Guess again: "^char * \<func ("
sprintf((char *)pbuf, "^\\[#a-zA-Z_]\\.\\*\\<%s\\s\\*(",
tagp.tagname);
if (!do_search(NULL, '/', pbuf, (long)1,
if (!do_search(NULL, '/', '/', pbuf, (long)1,
search_options, NULL))
found = 0;
}