summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2015-02-17 12:17:14 +0100
committerBram Moolenaar <Bram@vim.org>2015-02-17 12:17:14 +0100
commiteaa330e8e913823f1514bc419f23b885d6028cb9 (patch)
treec0b7080572bea4d4546e06b6c4df2fa93a31dbfa /src
parent4a427106954857c6f84c0b0dc07725e302a433c6 (diff)
downloadvim-eaa330e8e913823f1514bc419f23b885d6028cb9.zip
updated for version 7.4.632
Problem: 7.4.592 breaks the netrw plugin, because the autocommands are skipped. Solution: Roll back the change.
Diffstat (limited to 'src')
-rw-r--r--src/ex_cmds.c8
-rw-r--r--src/version.c2
2 files changed, 2 insertions, 8 deletions
diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index 897e6c39a..84928723e 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 03507f61c..9b1707007 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 */
/**/
+ 632,
+/**/
631,
/**/
630,