summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <bram@vim.org>2014-11-30 22:51:06 +0100
committerBram Moolenaar <bram@vim.org>2014-11-30 22:51:06 +0100
commitd15978ce2887669c4d5d904f7ced3f871bc37976 (patch)
tree8977904770407145e7602f423958f151226f498f
parent9d76390d7a14cb020fd73319737a0b17a5548971 (diff)
downloadvim-d15978ce2887669c4d5d904f7ced3f871bc37976.tar.gz
updated for version 7.4.540v7.4.540v7-4-540
Problem: Cannot build with tiny and small features. (Taro Muraoka) Solution: Add #ifdef around CMD_USER.
-rw-r--r--src/ex_docmd.c6
-rw-r--r--src/version.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index b926027f..607dbd9e 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 9e9e8028..57b5d764 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 540,
+/**/
539,
/**/
538,