diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 2a4fd14..6977904 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -1806,6 +1806,20 @@
 #endif
 			continue;
 
+	    case 'n':	if (!checkforcmd(&ea.cmd, "noautocmd", 3))
+			    break;
+#ifdef FEAT_AUTOCMD
+			if (cmdmod.save_ei == NULL)
+			{
+			    /* Set 'eventignore' to "all".  Don't free the
+			     * existing option value, we restore it later. */
+			    cmdmod.save_ei = vim_strsave(p_ei);
+			    set_string_option_direct((char_u *)"ei", -1,
+						   (char_u *)"all", OPT_FREE);
+			}
+#endif
+			continue;
+
 	    case 'r':	if (!checkforcmd(&ea.cmd, "rightbelow", 6))
 			    break;
 #ifdef FEAT_WINDOWS
@@ -2595,6 +2609,14 @@
 
     if (verbose_save >= 0)
 	p_verbose = verbose_save;
+#ifdef FEAT_AUTOCMD
+    if (cmdmod.save_ei != NULL)
+    {
+	/* Restore 'eventignore' to the value before ":noautocmd". */
+	set_string_option_direct((char_u *)"ei", -1, cmdmod.save_ei, OPT_FREE);
+	free_string_option(cmdmod.save_ei);
+    }
+#endif
 
     cmdmod = save_cmdmod;
 
diff --git a/src/vim.h b/src/vim.h
index c8357ff..ec69431 100644
--- a/src/vim.h
+++ b/src/vim.h
@@ -1576,7 +1576,8 @@
 #define VV_SCROLLSTART	44
 #define VV_SWAPNAME	45
 #define VV_SWAPCHOICE	46
-#define VV_LEN		47	/* number of v: vars */
+#define VV_SWAPCOMMAND	47
+#define VV_LEN		48	/* number of v: vars */
 
 #ifdef FEAT_CLIPBOARD