Mercurial > vim

changeset 12849:de80fb313baf v8.0.1301

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.0.1301: generated license file for NSIS has a modeline commit https://github.com/vim/vim/commit/7cb769a69f5b9d6951f4427c85e75f5b2909cf10 Author: Bram Moolenaar <Bram@vim.org> 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)
author Christian Brabandt <cb@256bit.org>
date Thu, 16 Nov 2017 17:45:04 +0100
parents 03beed2ac469
children 3064e2b6ca3b
files runtime/doc/Makefile src/version.c
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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.
--- 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,