From: Bram Moolenaar <Bram@vim.org>
Date: Tue, 17 Feb 2015 11:17:14 +0000 (+0100)
Subject: updated for version 7.4.632
X-Git-Tag: v7.4.632
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eaa330e8e913823f1514bc419f23b885d6028cb9;p=thirdparty%2Fvim.git

updated for version 7.4.632
Problem:    7.4.592 breaks the netrw plugin, because the autocommands are
            skipped.
Solution:   Roll back the change.
---

diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index 897e6c39ac..84928723ef 100644
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -3530,14 +3530,6 @@ 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 03507f61cd..9b1707007d 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 */
+/**/
+    632,
 /**/
     631,
 /**/