From 4f3c9ad4d7eeb48ccc33838afa6f25c0952ffb07 Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Wed, 7 Dec 2016 10:40:33 -0500
Subject: 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
---
 src/nvim/tag.c                 | 4 ++++
 src/nvim/testdir/test_alot.vim | 1 +
 src/nvim/version.c             | 2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'src')

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,
-- 
cgit