diff options
| author | James McCoy <jamessan@jamessan.com> | 2016-12-07 10:40:33 -0500 |
|---|---|---|
| committer | James McCoy <jamessan@jamessan.com> | 2016-12-07 10:44:31 -0500 |
| commit | 4f3c9ad4d7eeb48ccc33838afa6f25c0952ffb07 (patch) | |
| tree | 9c095096669f29743034dc3ef28ebdbc318ee85d | |
| parent | e6b7dade4f1dafb6dff3d1a7ebdc0ddbf7122d02 (diff) | |
| download | rneovim-4f3c9ad4d7eeb48ccc33838afa6f25c0952ffb07.tar.gz rneovim-4f3c9ad4d7eeb48ccc33838afa6f25c0952ffb07.tar.bz2 rneovim-4f3c9ad4d7eeb48ccc33838afa6f25c0952ffb07.zip | |
vim-patch:7.4.1751
Problem: Crash when 'tagstack' is off. (Dominique Pelle)
Solution: Fix it. (Hirohito Higashi)
https://github.com/vim/vim/commit/def5abe0a2727041ecee69afdccfca405333bd24
| -rw-r--r-- | src/nvim/tag.c | 4 | ||||
| -rw-r--r-- | src/nvim/testdir/test_alot.vim | 1 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
3 files changed, 6 insertions, 1 deletions
diff --git a/src/nvim/tag.c b/src/nvim/tag.c index 46fad688cc..a2d87a4bd2 100644 --- a/src/nvim/tag.c +++ b/src/nvim/tag.c @@ -216,6 +216,10 @@ do_tag ( if (!p_tgst && *tag != NUL) { use_tagstack = FALSE; new_tag = TRUE; + if (g_do_tagpreview != 0) { + xfree(ptag_entry.tagname); + ptag_entry.tagname = vim_strsave(tag); + } } else { if (g_do_tagpreview != 0) use_tagstack = FALSE; diff --git a/src/nvim/testdir/test_alot.vim b/src/nvim/testdir/test_alot.vim index c9d7b332e4..67e27e72a2 100644 --- a/src/nvim/testdir/test_alot.vim +++ b/src/nvim/testdir/test_alot.vim @@ -18,5 +18,6 @@ source test_statusline.vim source test_syn_attr.vim source test_tabline.vim source test_tabpage.vim +source test_tagjump.vim source test_unlet.vim source test_matchadd_conceal_utf8.vim diff --git a/src/nvim/version.c b/src/nvim/version.c index aea5143bb8..8677296d59 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -693,7 +693,7 @@ static int included_patches[] = { 1753, // 1753, // 1752, - // 1751, + 1751, // 1750 NA // 1749 NA 1748, |