From c2d7ded2e95ea3cd7b927d45e7970df5d9fdb9fc Mon Sep 17 00:00:00 2001
From: edyfox <edyfox@2a77ed30-b011-0410-a7ad-c7884a0aa172>
Date: Thu, 18 Sep 2008 11:46:12 +0000
Subject: [PATCH] Merged from the latest developing branch.

git-svn-id: https://vim.svn.sourceforge.net/svnroot/vim/trunk@1200 2a77ed30-b011-0410-a7ad-c7884a0aa172
---
 src/ex_cmds.h  | 2 ++
 src/ex_docmd.c | 1 +
 src/version.c  | 2 ++
 3 files changed, 5 insertions(+)

diff --git a/src/ex_cmds.h b/src/ex_cmds.h
index 2e8374a0..e8fef0a0 100644
--- a/src/ex_cmds.h
+++ b/src/ex_cmds.h
@@ -635,6 +635,8 @@ EX(CMD_nnoremenu,	"nnoremenu",	ex_menu,
 			RANGE|NOTADR|ZEROR|EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN),
 EX(CMD_noremap,		"noremap",	ex_map,
 			BANG|EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN),
+EX(CMD_noautocmd,	"noautocmd",	ex_wrongmodifier,
+			NEEDARG|EXTRA|NOTRLCOM),
 EX(CMD_nohlsearch,	"nohlsearch",	ex_nohlsearch,
 			TRLBAR|SBOXOK|CMDWIN),
 EX(CMD_noreabbrev,	"noreabbrev",	ex_abbreviate,
diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 07dcb774..509805f8 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -2978,6 +2978,7 @@ static struct cmdmod
     {"keepmarks", 3, FALSE},
     {"leftabove", 5, FALSE},
     {"lockmarks", 3, FALSE},
+    {"noautocmd", 3, FALSE},
     {"rightbelow", 6, FALSE},
     {"sandbox", 3, FALSE},
     {"silent", 3, FALSE},
diff --git a/src/version.c b/src/version.c
index ccc1c0ed..6b8444ce 100644
--- a/src/version.c
+++ b/src/version.c
@@ -677,6 +677,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    19,
+/**/
     18,
 /**/
     17,
-- 
2.11.4.GIT