commit 6ba3ec1bace67513a352326864cebc16b3c5bc56
author Bram Moolenaar <Bram@vim.org> Sat Jun 16 15:32:38 2018 +0200
committer Bram Moolenaar <Bram@vim.org> Sat Jun 16 15:32:38 2018 +0200
tree d8084d502418d4373963b7fe9f04ef8338e094af
parent 43dee181f596c81b99e200b6cdfeb02ecfed42c8

patch 8.1.0057: popup menu displayed wrong when using autocmd

Problem:    Popup menu displayed wrong when using autocmd.
Solution:   Use aucmd_prepbuf().  Force updating status line if the popup menu
            is going to be redrawn anyway. (Christian Brabandt, closes #3009)

src/edit.c

diff --git a/src/edit.c b/src/edit.c
index 92c9d6a..326a382 100644
--- a/src/edit.c
+++ b/src/edit.c
@@ -1704,7 +1704,12 @@
 #endif
 	    )
     {
+	aco_save_T	aco;
+
+	// save and restore curwin and curbuf, in case the autocmd changes them
+	aucmd_prepbuf(&aco, curbuf);
 	apply_autocmds(EVENT_TEXTCHANGEDI, NULL, NULL, FALSE, curbuf);
+	aucmd_restbuf(&aco);
 	curbuf->b_last_changedtick = CHANGEDTICK(curbuf);
     }
 
@@ -1716,7 +1721,12 @@
 	    && curbuf->b_last_changedtick_pum != CHANGEDTICK(curbuf)
 	    && pum_visible())
     {
+	aco_save_T	aco;
+
+	// save and restore curwin and curbuf, in case the autocmd changes them
+	aucmd_prepbuf(&aco, curbuf);
 	apply_autocmds(EVENT_TEXTCHANGEDP, NULL, NULL, FALSE, curbuf);
+	aucmd_restbuf(&aco);
 	curbuf->b_last_changedtick_pum = CHANGEDTICK(curbuf);
     }
 #endif