Mercurial > vim
diff src/search.c @ 11476:c45fb081391c v8.0.0621
patch 8.0.0621: :stag does not respect 'switchbuf'
commit https://github.com/vim/vim/commit/8ad80dea089ffeb1a845199c013e9bb4be1cd22e
Author: Bram Moolenaar <Bram@vim.org>
Date: Mon Jun 5 16:01:59 2017 +0200
patch 8.0.0621: :stag does not respect 'switchbuf'
Problem: The ":stag" command does not respect 'switchbuf'.
Solution: Check 'switchbuf' for tag commands that may open a new window.
(Ingo Karkat, closes #1681) Define macros for the return values
of getfile().
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Mon, 05 Jun 2017 16:15:03 +0200 |
| parents | 5c77ca0cf6a5 |
| children | 29a781fd3f27 |
line wrap: on
line diff
--- a/src/search.c +++ b/src/search.c @@ -1524,9 +1524,9 @@ end_do_search: * search_for_exact_line(buf, pos, dir, pat) * * Search for a line starting with the given pattern (ignoring leading - * white-space), starting from pos and going in direction dir. pos will + * white-space), starting from pos and going in direction "dir". "pos" will * contain the position of the match found. Blank lines match only if - * ADDING is set. if p_ic is set then the pattern must be in lowercase. + * ADDING is set. If p_ic is set then the pattern must be in lowercase. * Return OK for success, or FAIL if no line found. */ int @@ -5397,8 +5397,9 @@ search_line: #if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX) if (g_do_tagpreview != 0) { - if (getfile(0, curwin_save->w_buffer->b_fname, - NULL, TRUE, lnum, FALSE) > 0) + if (!GETFILE_SUCCESS(getfile( + 0, curwin_save->w_buffer->b_fname, + NULL, TRUE, lnum, FALSE))) break; /* failed to jump to file */ } else @@ -5408,8 +5409,9 @@ search_line: } else { - if (getfile(0, files[depth].name, NULL, TRUE, - files[depth].lnum, FALSE) > 0) + if (!GETFILE_SUCCESS(getfile( + 0, files[depth].name, NULL, TRUE, + files[depth].lnum, FALSE))) break; /* failed to jump to file */ /* autocommands may have changed the lnum, we don't * want that here */