summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2018-12-16 16:48:47 +0100
committerBram Moolenaar <Bram@vim.org>2018-12-16 16:48:47 +0100
commit6403bcdaf4dc36c0445a539a37510534ef87ca24 (patch)
tree3961cfb8cdda9084d2b87be62f9efacf234521b3
parent9eb76af451ddd8eaad0cd5dd629f18c4f4035171 (diff)
patch 8.1.0605: running make in the top directory echoes a commentv8.1.0605
Problem: Running make in the top directory echoes a comment. Solution: Prefix with @. (closes #3698)
-rw-r--r--Makefile2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 2155b588ac..6cbdc72ddc 100644
--- a/Makefile
+++ b/Makefile
@@ -39,7 +39,7 @@ all install uninstall tools config configure reconfig proto depend lint tags typ
@echo "Starting make in the src directory."
@echo "If there are problems, cd to the src directory and run make there"
cd src && $(MAKE) $@
- # When the target is "test" also run the indent tests.
+ @# When the target is "test" also run the indent tests.
@if test "$@" = "test"; then \
$(MAKE) indenttest; \
fi
diff --git a/src/version.c b/src/version.c
index 10361cb099..33694801ab 100644
--- a/src/version.c
+++ b/src/version.c
@@ -800,6 +800,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 605,
+/**/
604,
/**/
603,