patch 7.4.1751

Problem:    Crash when 'tagstack' is off. (Dominique Pelle)
Solution:   Fix it. (Hirohito Higashi)

diff --git a/src/tag.c b/src/tag.c
index 4224c6fc259165d989f51005416b25a4e26595bb..8f4495ee2c1702db3f7a7d7f84432d1539e830b9 100644 (file)
--- a/src/tag.c
+++ b/src/tag.c
@@ -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 5637a8e0c34f880e1e621b8b038c3592faf9f9e0..cb377716b598d5e4f28c2d89ae08b786579ffb99 100644 (file)
--- 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 695d0b731d91974a9e651cbd8ba962a5eb9eec75..7918d99ac1d1254391eeae837c8f857b069d932f 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -748,6 +748,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1751,
 /**/
     1750,
 /**/