summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2018-12-25 23:37:02 +0100
committerBram Moolenaar <Bram@vim.org>2018-12-25 23:37:02 +0100
commit4604fbbbff9e1f924e76a6b4695626b519bd4030 (patch)
tree4ed184c7cd6e324bcb708a02bf42d5b301c41df8
parentb413d2e6a8cc7b1611a41bfa9462b986393ca5fe (diff)
patch 8.1.0637: nsis file no longer usedv8.1.0637
Problem: Nsis file no longer used. Solution: Remove the file. (Ken Takata)
-rw-r--r--Filelist1
-rw-r--r--nsis/vimrc.ini68
-rw-r--r--src/version.c2
3 files changed, 2 insertions, 69 deletions
diff --git a/Filelist b/Filelist
index 6daf111f5d..de0c9b073e 100644
--- 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
index a3e9ecb5bb..0000000000
--- 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 (<C-V>, <C-C>, <C-A>, <C-S>, <C-F>, 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
index b2dbe38be5..c51a46d585 100644
--- 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,