diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index b926027f26..607dbd9eec 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 9e9e80281f..57b5d76421 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,
 /**/