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
commitf8a447c6dc51e55d38d72c7a893c7483de112cdb (patch)
tree57e35b7bf7d85df8fec62f3c68a65dfc08ff751a
parent4d84d9325f9537427f58c5ab0c1ce9a68be9d697 (diff)
downloadvim-git-f8a447c6dc51e55d38d72c7a893c7483de112cdb.tar.gz
updated for version 7.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 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
@@ -742,6 +742,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 540,
+/**/
539,
/**/
538,