summaryrefslogtreecommitdiff
path: root/src/search.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-08-05 21:52:04 +0200
committerBram Moolenaar <Bram@vim.org>2019-08-05 21:52:04 +0200
commit1b6d9c4215a56f3dda4df6e05d655c853551ffbd (patch)
tree57904cb4d8c5ac3513f1f7c946f8dafe949c8498 /src/search.c
parentb4a88a0441a65a0c9411c294825a08ca703f541e (diff)
downloadvim-git-1b6d9c4215a56f3dda4df6e05d655c853551ffbd.tar.gz
patch 8.1.1819: :pedit does not work with a popup preview windowv8.1.1819
Problem: :pedit does not work with a popup preview window. Solution: Avoid aborting with an error. (fixes #4777) Also double check that after prepare_tagpreview() the current window is not a popup window.
Diffstat (limited to 'src/search.c')
-rw-r--r--src/search.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/search.c b/src/search.c
index 626bc3daf..88b6c099e 100644
--- a/src/search.c
+++ b/src/search.c
@@ -5632,6 +5632,11 @@ search_line:
redraw_later(VALID);
win_enter(curwin_save, TRUE);
}
+# ifdef FEAT_TEXT_PROP
+ else if (WIN_IS_POPUP(curwin))
+ // can't keep focus in popup window
+ win_enter(firstwin, TRUE);
+# endif
#endif
break;
}