Mercurial > vim

diff src/tag.c @ 17632:5278e5a2a4e3 v8.1.1813

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.1.1813: ATTENTION prompt for a preview popup window commit https://github.com/vim/vim/commit/2debf1c16b93f8693a785f675320d9e949c96a97 Author: Bram Moolenaar <Bram@vim.org> Date: Sun Aug 4 20:44:19 2019 +0200 patch 8.1.1813: ATTENTION prompt for a preview popup window Problem: ATTENTION prompt for a preview popup window. Solution: Close the popup window if aborting the buffer load. Avoid getting the ATTENTION dialog.
author Bram Moolenaar <Bram@vim.org>
date Sun, 04 Aug 2019 20:45:05 +0200
parents ce04ebdf26b8
children daa1dea1c1b3
line wrap: on
line diff
--- a/src/tag.c
+++ b/src/tag.c
@@ -3663,7 +3663,7 @@ jumpto_tag(
 	if (g_do_tagpreview != 0
 			   && curwin != curwin_save && win_valid(curwin_save))
 	{
-	    /* Return cursor to where we were */
+	    // Return cursor to where we were
 	    validate_cursor();
 	    redraw_later(VALID);
 	    win_enter(curwin_save, TRUE);
@@ -3675,11 +3675,23 @@ jumpto_tag(
     else
     {
 	--RedrawingDisabled;
-	if (postponed_split)		/* close the window */
+	got_int = FALSE;  // don't want entering window to fail
+
+	if (postponed_split)		// close the window
 	{
 	    win_close(curwin, FALSE);
 	    postponed_split = 0;
 	}
+#if defined(FEAT_QUICKFIX) && defined(FEAT_TEXT_PROP)
+	else if (WIN_IS_POPUP(curwin))
+	{
+	    win_T   *wp = curwin;
+
+	    if (win_valid(curwin_save))
+		win_enter(curwin_save, TRUE);
+	    popup_close(wp->w_id);
+	}
+#endif
     }
 
 erret: