Apply patch 7.2.445.
diff --git a/src/undo.c b/src/undo.c
index 497fc6b..86b4d81 100644
--- a/src/undo.c
+++ b/src/undo.c
@@ -196,7 +196,7 @@
}
}
- void
+ static void
u_check(int newhead_may_be_NULL)
{
seen_b_u_newhead = 0;
@@ -331,6 +331,9 @@
return TRUE;
}
+/*
+ * Common code for various ways to save text before a change.
+ */
static int
u_savecommon(top, bot, newbot)
linenr_T top, bot;
@@ -385,7 +388,7 @@
size = bot - top - 1;
/*
- * if curbuf->b_u_synced == TRUE make a new header
+ * If curbuf->b_u_synced == TRUE make a new header.
*/
if (curbuf->b_u_synced)
{
@@ -1938,6 +1941,12 @@
u_oldcount = -1;
while (count--)
{
+ /* Do the change warning now, so that it triggers FileChangedRO when
+ * needed. This may cause the file to be reloaded, that must happen
+ * before we do anything, because it may change curbuf->b_u_curhead
+ * and more. */
+ change_warning(0);
+
if (undo_undoes)
{
if (curbuf->b_u_curhead == NULL) /* first undo */
@@ -2230,8 +2239,11 @@
/*
* First go up the tree as much as needed.
*/
- for (;;)
+ while (!got_int)
{
+ /* Do the change warning now, for the same reason as above. */
+ change_warning(0);
+
uhp = curbuf->b_u_curhead;
if (uhp == NULL)
uhp = curbuf->b_u_newhead;
@@ -2248,9 +2260,15 @@
/*
* And now go down the tree (redo), branching off where needed.
*/
- uhp = curbuf->b_u_curhead;
- while (uhp != NULL)
+ while (!got_int)
{
+ /* Do the change warning now, for the same reason as above. */
+ change_warning(0);
+
+ uhp = curbuf->b_u_curhead;
+ if (uhp == NULL)
+ break;
+
/* Go back to the first branch with a mark. */
while (uhp->uh_alt_prev.ptr != NULL
&& uhp->uh_alt_prev.ptr->uh_walk == mark)
@@ -2349,6 +2367,12 @@
int empty_buffer; /* buffer became empty */
u_header_T *curhead = curbuf->b_u_curhead;
+#ifdef FEAT_AUTOCMD
+ /* Don't want autocommands using the undo structures here, they are
+ * invalid till the end. */
+ block_autocmds();
+#endif
+
#ifdef U_DEBUG
u_check(FALSE);
#endif
@@ -2378,6 +2402,9 @@
if (top > curbuf->b_ml.ml_line_count || top >= bot
|| bot > curbuf->b_ml.ml_line_count + 1)
{
+#ifdef FEAT_AUTOCMD
+ unblock_autocmds();
+#endif
EMSG(_("E438: u_undo: line numbers wrong"));
changed(); /* don't want UNCHANGED now */
return;
@@ -2592,6 +2619,10 @@
/* The timestamp can be the same for multiple changes, just use the one of
* the undone/redone change. */
curbuf->b_u_time_cur = curhead->uh_time;
+
+#ifdef FEAT_AUTOCMD
+ unblock_autocmds();
+#endif
#ifdef U_DEBUG
u_check(FALSE);
#endif