summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <bram@vim.org>2015-01-27 13:33:23 +0100
committerBram Moolenaar <bram@vim.org>2015-01-27 13:33:23 +0100
commit3f9b3deb00976bc38a9547d45af7fc36cf4b64f3 (patch)
treeb4eb462212877a9d7d3083d0f00c7d2de08d3482
parent6125b261f48f7409d3209aa0f28d9f9d21cfee2c (diff)
downloadvim-3f9b3deb00976bc38a9547d45af7fc36cf4b64f3.tar.gz
updated for version 7.4.596v7.4.596v7-4-596
Problem: Tiny build doesn't compile. (Ike Devolder) Solution: Add #ifdef.
-rw-r--r--src/ex_cmds.c2
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index e18a752c..897e6c39 100644
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -3530,11 +3530,13 @@ do_ecmd(fnum, ffname, sfname, eap, newlnum, flags, oldwin)
check_fname() == FAIL)
goto theend;
+#ifdef FEAT_QUICKFIX
/* ":e foobar" when already editing "foobar" will reload the file.
* But when 'buftype' is "nofile" there is no file to load, so don't
* do anything. */
if (curbuf->b_p_bt[0] == 'n' && curbuf->b_p_bt[2] == 'f')
goto theend;
+#endif
oldbuf = (flags & ECMD_OLDBUF);
}
diff --git a/src/version.c b/src/version.c
index fcccaba7..5cb09f88 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 */
/**/
+ 596,
+/**/
595,
/**/
594,