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
commit932d88662f0d6636586aa3a321502609ebad73b5 (patch)
treeffc2e610596c2de5eb0657b3a533befd8b5d88bc
parent322a24af83a322b616da01969b37395df9ab3aa3 (diff)
downloadvim-932d88662f0d6636586aa3a321502609ebad73b5.zip
updated for version 7.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 e18a752cb..897e6c39a 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 fcccaba7f..5cb09f885 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,