diff --git a/src/normal.c b/src/normal.c
index 2b867bb..7bae34e 100644
--- a/src/normal.c
+++ b/src/normal.c
@@ -2041,6 +2041,8 @@
 
 		if (restart_edit == 0)
 		    restart_edit = restart_edit_save;
+		else
+		    cap->retval |= CA_COMMAND_BUSY;
 	    }
 #else
 	    vim_beep(BO_OPER);
diff --git a/src/ops.c b/src/ops.c
index 7d656a6..0a48912 100644
--- a/src/ops.c
+++ b/src/ops.c
@@ -2571,7 +2571,8 @@
     }
 
     t1 = oap->start;
-    edit(NUL, FALSE, (linenr_T)count1);
+    if (edit(NUL, FALSE, (linenr_T)count1))
+	return;
 
     /* When a tab was inserted, and the characters in front of the tab
      * have been converted to a tab as well, the column of the cursor
diff --git a/src/version.c b/src/version.c
index ef4a45f..daa911c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    282,
+/**/
     281,
 /**/
     280,