From f8a447c6dc51e55d38d72c7a893c7483de112cdb Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Sun, 30 Nov 2014 22:51:06 +0100
Subject: [PATCH] updated for version 7.4.540 Problem:    Cannot build with
 tiny and small features. (Taro Muraoka) Solution:   Add #ifdef around
 CMD_USER.

---
 src/ex_docmd.c | 6 +++++-
 src/version.c  | 2 ++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index b926027f2..607dbd9ee 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -2129,7 +2129,11 @@ do_one_cmd(cmdlinep, sourcing,
  * is equal to the lower.
  */
 
-    if (ea.cmdidx != CMD_USER && ea.cmdidx != CMD_SIZE)
+    if (ea.cmdidx != CMD_SIZE
+#ifdef FEAT_USR_CMDS
+	&& ea.cmdidx != CMD_USER
+#endif
+       )
 	ea.addr_type = cmdnames[(int)ea.cmdidx].cmd_addr_type;
     else
 	ea.addr_type = ADDR_LINES;
diff --git a/src/version.c b/src/version.c
index 9e9e80281..57b5d7642 100644
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    540,
 /**/
     539,
 /**/