From: Bram Moolenaar <Bram@vim.org>
Date: Tue, 27 Jan 2015 12:33:23 +0000 (+0100)
Subject: updated for version 7.4.596
X-Git-Tag: v7.4.596
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=932d88662f0d6636586aa3a321502609ebad73b5;p=thirdparty%2Fvim.git

updated for version 7.4.596
Problem:    Tiny build doesn't compile.  (Ike Devolder)
Solution:   Add #ifdef.
---

diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index e18a752cb0..897e6c39ac 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 fcccaba7f6..5cb09f8855 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 */
+/**/
+    596,
 /**/
     595,
 /**/