diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2019-10-26 12:50:51 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-26 12:50:51 -0700 |
| commit | ad532d3c660791337a9ea5100ab1e330480e382a (patch) | |
| tree | 6142d4a147f26451a8679d441930f7691cecfdc3 /src/nvim/tag.c | |
| parent | 4b5e2f7a0b275230456f92892a89c781616284a8 (diff) | |
| parent | 6dcc1d100572b462f75f64f7e98a0b5d80144cba (diff) | |
| download | rneovim-ad532d3c660791337a9ea5100ab1e330480e382a.tar.gz rneovim-ad532d3c660791337a9ea5100ab1e330480e382a.tar.bz2 rneovim-ad532d3c660791337a9ea5100ab1e330480e382a.zip | |
Merge #11294 from tomtomjhj/vim-8.1.2173
vim-patch:8.1.{2173,2207,2218}
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; } } |