diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-04-18 19:46:15 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-04-18 19:46:15 +0200 |
| commit | def5abe0a2727041ecee69afdccfca405333bd24 (patch) | |
| tree | b3361575721de0fd577394ff1441ab8df20cfc52 | |
| parent | 7f7c3325d3f1baba32263a3457cfc4d90ecd5ff1 (diff) | |
| download | vim-git-def5abe0a2727041ecee69afdccfca405333bd24.tar.gz | |
patch 7.4.1751v7.4.1751
Problem: Crash when 'tagstack' is off. (Dominique Pelle)
Solution: Fix it. (Hirohito Higashi)
| -rw-r--r-- | src/tag.c | 8 | ||||
| -rw-r--r-- | src/testdir/test_alot.vim | 1 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 11 insertions, 0 deletions
@@ -200,6 +200,14 @@ do_tag( { use_tagstack = FALSE; new_tag = TRUE; +#if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX) + if (g_do_tagpreview != 0) + { + vim_free(ptag_entry.tagname); + if ((ptag_entry.tagname = vim_strsave(tag)) == NULL) + goto end_do_tag; + } +#endif } else { diff --git a/src/testdir/test_alot.vim b/src/testdir/test_alot.vim index 5637a8e0c..cb377716b 100644 --- a/src/testdir/test_alot.vim +++ b/src/testdir/test_alot.vim @@ -27,6 +27,7 @@ source test_sort.vim source test_statusline.vim source test_syn_attr.vim source test_tabline.vim +source test_tagjump.vim source test_timers.vim source test_undolevels.vim source test_unlet.vim diff --git a/src/version.c b/src/version.c index 695d0b731..7918d99ac 100644 --- a/src/version.c +++ b/src/version.c @@ -749,6 +749,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1751, +/**/ 1750, /**/ 1749, |