Mercurial > vim
comparison src/search.c @ 17644:daa1dea1c1b3 v8.1.1819
patch 8.1.1819: :pedit does not work with a popup preview window
commit https://github.com/vim/vim/commit/1b6d9c4215a56f3dda4df6e05d655c853551ffbd
Author: Bram Moolenaar <Bram@vim.org>
Date: Mon Aug 5 21:52:04 2019 +0200
patch 8.1.1819: :pedit does not work with a popup preview window
Problem: :pedit does not work with a popup preview window.
Solution: Avoid aborting with an error. (fixes https://github.com/vim/vim/issues/4777) Also double check
that after prepare_tagpreview() the current window is not a
popup window.
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Mon, 05 Aug 2019 22:00:06 +0200 |
parents | d4b2a212fa2f |
children | 9efb4dda9720 |
comparison
equal
deleted
inserted
replaced
17643:dfc6ba5db4ec | 17644:daa1dea1c1b3 |
---|---|
5630 /* Return cursor to where we were */ | 5630 /* Return cursor to where we were */ |
5631 validate_cursor(); | 5631 validate_cursor(); |
5632 redraw_later(VALID); | 5632 redraw_later(VALID); |
5633 win_enter(curwin_save, TRUE); | 5633 win_enter(curwin_save, TRUE); |
5634 } | 5634 } |
5635 # ifdef FEAT_TEXT_PROP | |
5636 else if (WIN_IS_POPUP(curwin)) | |
5637 // can't keep focus in popup window | |
5638 win_enter(firstwin, TRUE); | |
5639 # endif | |
5635 #endif | 5640 #endif |
5636 break; | 5641 break; |
5637 } | 5642 } |
5638 #ifdef FEAT_INS_EXPAND | 5643 #ifdef FEAT_INS_EXPAND |
5639 exit_matched: | 5644 exit_matched: |