aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authoroni-link <knil.ino@gmail.com>2014-04-18 15:42:51 +0200
committerThiago de Arruda <tpadilha84@gmail.com>2014-04-24 10:30:36 -0300
commit471da2de810964052d4d2ab5ba0e23446ea7880d (patch)
tree46d9da7fbcbc4fd67f37af6cc01bd5ee8c6c30ac /src
parent8c5f3aebc8e931b99c414b22e1faa0bf9aebf7b3 (diff)
downloadrneovim-471da2de810964052d4d2ab5ba0e23446ea7880d.tar.gz
rneovim-471da2de810964052d4d2ab5ba0e23446ea7880d.tar.bz2
rneovim-471da2de810964052d4d2ab5ba0e23446ea7880d.zip
vim-patch:7.4.237
Problem: When some patches was not included has("patch-7.4.123") may return true falsely. Solution: Check for the specific patch number. https://code.google.com/p/vim/source/detail?r=71b165a378ad580818f6d497ecf0f8ad054a9683
Diffstat (limited to 'src')
-rw-r--r--src/eval.c3
-rw-r--r--src/version.c2
2 files changed, 2 insertions, 3 deletions
diff --git a/src/eval.c b/src/eval.c
index b53b04258f..09e1f8b4aa 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -10371,14 +10371,13 @@ static void f_has(typval_T *argvars, typval_T *rettv)
&& vim_isdigit(name[10])) {
int major = atoi((char *)name + 6);
int minor = atoi((char *)name + 8);
- int patch = atoi((char *)name + 10);
// Expect "patch-9.9.01234".
n = (major < VIM_VERSION_MAJOR
|| (major == VIM_VERSION_MAJOR
&& (minor < VIM_VERSION_MINOR
|| (minor == VIM_VERSION_MINOR
- && patch <= highest_patch()))));
+ && has_patch(atoi((char *)name + 10))))));
} else {
n = has_patch(atoi((char *)name + 5));
}
diff --git a/src/version.c b/src/version.c
index 618caece87..d7a8829106 100644
--- a/src/version.c
+++ b/src/version.c
@@ -223,7 +223,7 @@ static int included_patches[] = {
240,
239,
//238,
- //237,
+ 237,
236,
//235,
234,