diff options
author | Justin M. Keyes <justinkz@gmail.com> | 2019-08-18 13:05:17 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-08-18 13:05:17 +0200 |
commit | c5efa9c352d63febd30764c04738f81e512b19f6 (patch) | |
tree | d897e97ba00cabe3028e4978ce95ac527cfeac86 /src/nvim/ex_docmd.c | |
parent | b7ce589cb879030b70d5b01aaa6bf1e521f5b9cb (diff) | |
parent | 454adf15db07eebd4509e0256f4e20ef06db1d6e (diff) | |
download | rneovim-c5efa9c352d63febd30764c04738f81e512b19f6.tar.gz rneovim-c5efa9c352d63febd30764c04738f81e512b19f6.tar.bz2 rneovim-c5efa9c352d63febd30764c04738f81e512b19f6.zip |
Merge #10800 from janlazo/vim-8.1.1870
vim-patch:8.1.{1679,1839,1870}
Diffstat (limited to 'src/nvim/ex_docmd.c')
-rw-r--r-- | src/nvim/ex_docmd.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c index 18043bf710..247f4c09ef 100644 --- a/src/nvim/ex_docmd.c +++ b/src/nvim/ex_docmd.c @@ -8432,13 +8432,15 @@ static void ex_pedit(exarg_T *eap) { win_T *curwin_save = curwin; + // Open the preview window or popup and make it the current window. g_do_tagpreview = p_pvh; prepare_tagpreview(true); - keep_help_flag = bt_help(curwin_save->w_buffer); + + // Edit the file. do_exedit(eap, NULL); - keep_help_flag = FALSE; + if (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); |