commit 57657d85c6c3d812e99b5e5d5161c07c66ac7dc7
author Bram Moolenaar <Bram@vim.org> Fri Apr 21 22:12:41 2006 +0000
committer Bram Moolenaar <Bram@vim.org> Fri Apr 21 22:12:41 2006 +0000
tree 35b6845dc38717148718ac5cf70553b8c2cb96d8
parent fc1421eb53b17aa58b01a9c07ba2007eb4a1aa4f

updated for version 7.0e05

src/undo.c

diff --git a/src/undo.c b/src/undo.c
index f9e735a..fd1bcc7 100644
--- a/src/undo.c
+++ b/src/undo.c
@@ -1405,10 +1405,15 @@
 ex_undojoin(eap)
     exarg_T *eap;
 {
-    if (!curbuf->b_u_synced)
-	return;		    /* already unsynced */
     if (curbuf->b_u_newhead == NULL)
 	return;		    /* nothing changed before */
+    if (curbuf->b_u_curhead != NULL)
+    {
+	EMSG(_("E790: undojoin is not allowed after undo"));
+	return;
+    }
+    if (!curbuf->b_u_synced)
+	return;		    /* already unsynced */
     if (p_ul < 0)
 	return;		    /* no entries, nothing to do */
     else