Mercurial > vim
comparison src/tag.c @ 17632:5278e5a2a4e3 v8.1.1813
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 |
comparison
equal
deleted
inserted
replaced
17631:1f3f6e1d69cf | 17632:5278e5a2a4e3 |
---|---|
3661 | 3661 |
3662 #if defined(FEAT_QUICKFIX) | 3662 #if defined(FEAT_QUICKFIX) |
3663 if (g_do_tagpreview != 0 | 3663 if (g_do_tagpreview != 0 |
3664 && curwin != curwin_save && win_valid(curwin_save)) | 3664 && curwin != curwin_save && win_valid(curwin_save)) |
3665 { | 3665 { |
3666 /* Return cursor to where we were */ | 3666 // Return cursor to where we were |
3667 validate_cursor(); | 3667 validate_cursor(); |
3668 redraw_later(VALID); | 3668 redraw_later(VALID); |
3669 win_enter(curwin_save, TRUE); | 3669 win_enter(curwin_save, TRUE); |
3670 } | 3670 } |
3671 #endif | 3671 #endif |
3673 --RedrawingDisabled; | 3673 --RedrawingDisabled; |
3674 } | 3674 } |
3675 else | 3675 else |
3676 { | 3676 { |
3677 --RedrawingDisabled; | 3677 --RedrawingDisabled; |
3678 if (postponed_split) /* close the window */ | 3678 got_int = FALSE; // don't want entering window to fail |
3679 | |
3680 if (postponed_split) // close the window | |
3679 { | 3681 { |
3680 win_close(curwin, FALSE); | 3682 win_close(curwin, FALSE); |
3681 postponed_split = 0; | 3683 postponed_split = 0; |
3682 } | 3684 } |
3685 #if defined(FEAT_QUICKFIX) && defined(FEAT_TEXT_PROP) | |
3686 else if (WIN_IS_POPUP(curwin)) | |
3687 { | |
3688 win_T *wp = curwin; | |
3689 | |
3690 if (win_valid(curwin_save)) | |
3691 win_enter(curwin_save, TRUE); | |
3692 popup_close(wp->w_id); | |
3693 } | |
3694 #endif | |
3683 } | 3695 } |
3684 | 3696 |
3685 erret: | 3697 erret: |
3686 #if defined(FEAT_QUICKFIX) | 3698 #if defined(FEAT_QUICKFIX) |
3687 g_do_tagpreview = 0; /* For next time */ | 3699 g_do_tagpreview = 0; /* For next time */ |