# HG changeset patch # User Christian Brabandt # Date 1510850704 -3600 # Node ID de80fb313baf4ce3840eb96e8c99eba663c0985f # Parent 03beed2ac4694007f03b663b552791a551d6bf68 patch 8.0.1301: generated license file for NSIS has a modeline commit https://github.com/vim/vim/commit/7cb769a69f5b9d6951f4427c85e75f5b2909cf10 Author: Bram Moolenaar Date: Thu Nov 16 17:36:02 2017 +0100 patch 8.0.1301: generated license file for NSIS has a modeline Problem: Generated license file for NSIS has a modeline. Solution: Adjust the pattern for sed. (Ken Takata) diff --git a/runtime/doc/Makefile b/runtime/doc/Makefile --- a/runtime/doc/Makefile +++ b/runtime/doc/Makefile @@ -343,7 +343,7 @@ xxd.man: xxd.1 nroff -man xxd.1 | sed -e s/.//g > xxd.man uganda.nsis.txt: uganda.txt - sed -e 's/[ ]*\*[-a-zA-Z0-9.]*\*//g' -e 's/vim:tw=78://' \ + sed -e 's/[ ]*\*[-a-zA-Z0-9.]*\*//g' -e 's/vim:tw=78:.*//' \ uganda.txt | uniq >uganda.nsis.txt # Awk version of .txt to .html conversion. diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -767,6 +767,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1301, +/**/ 1300, /**/ 1299,