diff options
author | Jaehwang Jerry Jung <tomtomjhj@gmail.com> | 2019-10-25 19:54:53 +0900 |
---|---|---|
committer | Jaehwang Jerry Jung <tomtomjhj@gmail.com> | 2019-10-27 03:35:19 +0900 |
commit | 034077ed1c1fa71aa15829ed2dfb27de4a5e5359 (patch) | |
tree | 9f819d83c0c5848e51972c098ce85fce68b39be4 /src/nvim/tag.c | |
parent | 19ba36d0e1bb4ef28f8aa92c7386345fbcf78cf2 (diff) | |
download | rneovim-034077ed1c1fa71aa15829ed2dfb27de4a5e5359.tar.gz rneovim-034077ed1c1fa71aa15829ed2dfb27de4a5e5359.tar.bz2 rneovim-034077ed1c1fa71aa15829ed2dfb27de4a5e5359.zip |
vim-patch:8.1.2173: searchit() has too many arguments
Problem: Searchit() has too many arguments.
Solution: Move optional arguments to a struct. Add the "wrapped" argument.
https://github.com/vim/vim/commit/92ea26b925a0835badb0af2d5887238a4198cabb
Diffstat (limited to 'src/nvim/tag.c')
-rw-r--r-- | src/nvim/tag.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/nvim/tag.c b/src/nvim/tag.c index 20fd7caa51..a3967c70b5 100644 --- a/src/nvim/tag.c +++ b/src/nvim/tag.c @@ -2813,7 +2813,7 @@ static int jumpto_tag( save_lnum = curwin->w_cursor.lnum; curwin->w_cursor.lnum = 0; /* start search before first line */ if (do_search(NULL, pbuf[0], pbuf + 1, (long)1, - search_options, NULL, NULL)) { + search_options, NULL)) { retval = OK; } else { int found = 1; @@ -2824,20 +2824,18 @@ static int jumpto_tag( */ p_ic = TRUE; if (!do_search(NULL, pbuf[0], pbuf + 1, (long)1, - search_options, NULL, NULL)) { + search_options, NULL)) { // Failed to find pattern, take a guess: "^func (" found = 2; (void)test_for_static(&tagp); cc = *tagp.tagname_end; *tagp.tagname_end = NUL; snprintf((char *)pbuf, LSIZE, "^%s\\s\\*(", tagp.tagname); - if (!do_search(NULL, '/', pbuf, (long)1, - search_options, NULL, NULL)) { + if (!do_search(NULL, '/', pbuf, (long)1, search_options, NULL)) { // Guess again: "^char * \<func (" snprintf((char *)pbuf, LSIZE, "^\\[#a-zA-Z_]\\.\\*\\<%s\\s\\*(", tagp.tagname); - if (!do_search(NULL, '/', pbuf, (long)1, - search_options, NULL, NULL)) { + if (!do_search(NULL, '/', pbuf, (long)1, search_options, NULL)) { found = 0; } } |