summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-08-27 16:06:46 +0200
committerBram Moolenaar <Bram@vim.org>2020-08-27 16:06:46 +0200
commit228e62975e7aef9d6224a5a7c43625c1c1494fc2 (patch)
treee8234906e38fc6206a62981e37138022b5d92da0
parent6e3aeec8461cf27396b6574b5438019a00684e00 (diff)
downloadvim-git-228e62975e7aef9d6224a5a7c43625c1c1494fc2.tar.gz
patch 8.2.1526: line in testdir Makefile got commented outv8.2.1526
Problem: Line in testdir Makefile got commented out. (Christian Brabandt) Solution: Revert.
-rw-r--r--src/testdir/Makefile2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/testdir/Makefile b/src/testdir/Makefile
index 6431f6a6b..2fb329aa1 100644
--- a/src/testdir/Makefile
+++ b/src/testdir/Makefile
@@ -12,7 +12,7 @@ SCRIPTSOURCE = ../../runtime
# Comment out this line to see the verbose output of tests.
#
# Catches SwapExists to avoid hanging at the ATTENTION prompt.
-#REDIR_TEST_TO_NULL = --cmd 'au SwapExists * let v:swapchoice = "e"' > /dev/null
+REDIR_TEST_TO_NULL = --cmd 'au SwapExists * let v:swapchoice = "e"' > /dev/null
# Uncomment this line to use valgrind for memory leaks and extra warnings.
# The output goes into a file "valgrind.testN"
diff --git a/src/version.c b/src/version.c
index 71851c849..514cc6890 100644
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1526,
+/**/
1525,
/**/
1524,