# HG changeset patch # User Bram Moolenaar # Date 1594406705 -7200 # Node ID c2fbac867d9c37c32c18491f06438270cb45cac6 # Parent c2a90975a9ed7d2b79e78b772aae28e33fb7c04f patch 8.2.1172: error messages when doing "make clean" in doc or tee Commit: https://github.com/vim/vim/commit/08fc48492acc07259d91293df12bf66447819443 Author: Bram Moolenaar Date: Fri Jul 10 20:40:23 2020 +0200 patch 8.2.1172: error messages when doing "make clean" in doc or tee Problem: Error messages when doing "make clean" in the runtime/doc or src/tee directories. Solution: Use "rm -f". diff --git a/runtime/doc/Makefile b/runtime/doc/Makefile --- a/runtime/doc/Makefile +++ b/runtime/doc/Makefile @@ -396,7 +396,7 @@ test_urls: vim -S test_urls.vim clean: - -rm doctags *.html tags.ref + -rm -f doctags *.html tags.ref # These files are in the extra archive, skip if not present diff --git a/src/tee/Makefile b/src/tee/Makefile --- a/src/tee/Makefile +++ b/src/tee/Makefile @@ -4,7 +4,7 @@ CC=gcc CFLAGS=-O2 -fno-strength-reduce ifneq (sh.exe, $(SHELL)) -DEL = rm +DEL = rm -f else DEL = del endif diff --git a/src/version.c b/src/version.c --- 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 */ /**/ + 1172, +/**/ 1171, /**/ 1170,