diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-11-16 17:36:02 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-11-16 17:36:02 +0100 |
| commit | 7cb769a69f5b9d6951f4427c85e75f5b2909cf10 (patch) | |
| tree | 1fdaa33d7c21366bede14ab232a1dcd6bf08f43b | |
| parent | cd142e3369db8888163a511dbe9907bcd138829c (diff) | |
| download | vim-git-8.0.1301.tar.gz | |
patch 8.0.1301: generated license file for NSIS has a modelinev8.0.1301
Problem: Generated license file for NSIS has a modeline.
Solution: Adjust the pattern for sed. (Ken Takata)
| -rw-r--r-- | runtime/doc/Makefile | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/runtime/doc/Makefile b/runtime/doc/Makefile index 46b6125a9..d60501e0f 100644 --- 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 index 2a50a1b51..cf62d5937 100644 --- 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, |