summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorK.Takata <kentkt@csc.jp>2021-05-26 21:49:18 +0200
committerBram Moolenaar <Bram@vim.org>2021-05-26 21:49:18 +0200
commitc512599b22aac7305b171566c2f595e0ae85b885 (patch)
tree052b8b4cf8067b7fce8d50d10b01a2256ec4dcd1
parent7d840e9ac7529ec144e103d2a13abce8aa8c1ff1 (diff)
downloadvim-git-c512599b22aac7305b171566c2f595e0ae85b885.tar.gz
patch 8.2.2889: typo and verbose comment in Makefilesv8.2.2889
Problem: Typo and verbose comment in Makefiles. Solution: Fix typo. Use @#. (Ken Takata, closes #8252)
-rw-r--r--Makefile2
-rw-r--r--src/testdir/Makefile2
-rw-r--r--src/version.c2
3 files changed, 4 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index e377392b5..86c9f65f1 100644
--- a/Makefile
+++ b/Makefile
@@ -152,7 +152,7 @@ MINOR = 2
# > cd src
# > msvc2015.bat
# - Build the console binary:
-# > nmake -f Mae_mvc.mak
+# > nmake -f Make_mvc.mak
# - Run the tests and check the output:
# > nmake -f Make_mvc.mak testclean
# > nmake -f Make_mvc.mak test
diff --git a/src/testdir/Makefile b/src/testdir/Makefile
index 050a032f1..3f33bf864 100644
--- a/src/testdir/Makefile
+++ b/src/testdir/Makefile
@@ -40,7 +40,7 @@ tiny: nolog tinytests report
benchmark: $(SCRIPTS_BENCH)
report:
- # without the +eval feature test_result.log is a copy of test.log
+ @# without the +eval feature test_result.log is a copy of test.log
@/bin/sh -c "if test -f test.log; \
then cp test.log test_result.log; \
else echo No failures reported > test_result.log; \
diff --git a/src/version.c b/src/version.c
index 7902d3b52..56f0f0b94 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2889,
+/**/
2888,
/**/
2887,