summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/popupmnu.c10
-rw-r--r--src/version.c2
2 files changed, 12 insertions, 0 deletions
diff --git a/src/popupmnu.c b/src/popupmnu.c
index 68ee2d562..2f5e7dc81 100644
--- a/src/popupmnu.c
+++ b/src/popupmnu.c
@@ -568,7 +568,11 @@ pum_set_selected(n, repeat)
if (p_pvh > 0 && p_pvh < g_do_tagpreview)
g_do_tagpreview = p_pvh;
++RedrawingDisabled;
+ /* Prevent undo sync here, if an autocommand syncs undo weird
+ * things can happen to the undo tree. */
+ ++no_u_sync;
resized = prepare_tagpreview(FALSE);
+ --no_u_sync;
--RedrawingDisabled;
g_do_tagpreview = 0;
@@ -659,7 +663,9 @@ pum_set_selected(n, repeat)
* redraw. */
if (resized)
{
+ ++no_u_sync;
win_enter(curwin_save, TRUE);
+ --no_u_sync;
update_topline();
}
@@ -670,7 +676,11 @@ pum_set_selected(n, repeat)
pum_do_redraw = FALSE;
if (!resized && win_valid(curwin_save))
+ {
+ ++no_u_sync;
win_enter(curwin_save, TRUE);
+ --no_u_sync;
+ }
/* May need to update the screen again when there are
* autocommands involved. */
diff --git a/src/version.c b/src/version.c
index 775b027f1..61e0bf0e5 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 901,
+/**/
900,
/**/
899,