# HG changeset patch # User Bram Moolenaar # Date 1545777904 -3600 # Node ID 31639f035d76723ddd13f8925ff1af369a1ddc80 # Parent 9f0d16a7148dd5c6a62bd36df123e25bb64169c5 patch 8.1.0637: nsis file no longer used commit https://github.com/vim/vim/commit/4604fbbbff9e1f924e76a6b4695626b519bd4030 Author: Bram Moolenaar Date: Tue Dec 25 23:37:02 2018 +0100 patch 8.1.0637: nsis file no longer used Problem: Nsis file no longer used. Solution: Remove the file. (Ken Takata) diff --git a/Filelist b/Filelist --- a/Filelist +++ b/Filelist @@ -475,7 +475,6 @@ SRC_DOS = \ src/xxd/Make_mvc.mak \ nsis/gvim.nsi \ nsis/gvim_version.nsh \ - nsis/vimrc.ini \ nsis/README.txt \ nsis/lang/*.nsi \ uninstal.txt \ diff --git a/nsis/vimrc.ini b/nsis/vimrc.ini deleted file mode 100644 --- a/nsis/vimrc.ini +++ /dev/null @@ -1,68 +0,0 @@ -[Settings] -NumFields=7 - -[Field 1] -Type=GroupBox -Left=0 -Right=-1 -Top=0 -Bottom=53 -Text=" Key remapping " - -[Field 2] -Type=radiobutton -Text=Do not remap keys for Windows behavior (Default) -Left=10 -Right=-10 -Top=17 -Bottom=25 -State=1 -Flags=GROUP - -[Field 3] -Type=radiobutton -Text=Remap a few keys for Windows behavior (, , , , , etc) -Left=10 -Right=-10 -Top=30 -Bottom=47 -State=0 -Flags=NOTABSTOP - -[Field 4] -Type=GroupBox -Left=0 -Right=-1 -Top=55 -Bottom=-5 -Text=" Mouse behavior " - -[Field 5] -Type=radiobutton -Text=Right button extends selection, left button starts visual mode (Unix) -Left=10 -Right=-5 -Top=72 -Bottom=80 -State=0 -Flags=GROUP - -[Field 6] -Type=radiobutton -Text=Right button has a popup menu, left button starts select mode (Windows) -Left=10 -Right=-5 -Top=85 -Bottom=93 -State=0 -Flags=NOTABSTOP - -[Field 7] -Type=radiobutton -Text=Right button has a popup menu, left button starts visual mode (Default) -Left=10 -Right=-5 -Top=98 -Bottom=106 -State=1 -Flags=NOTABSTOP diff --git a/src/version.c b/src/version.c --- 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 */ /**/ + 637, +/**/ 636, /**/ 635,