summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-01-15 22:08:23 +0100
committerBram Moolenaar <Bram@vim.org>2016-01-15 22:08:23 +0100
commit36d7cd8965bc4027d420c7d70c56ac95d83d3bfa (patch)
tree44bd61e0e43b82b39871cd5583317c809b05e0b5
parentb7604cc19fa1db6a8182546bf662aa13d4574d7a (diff)
patch 7.4.1099v7.4.1099
Problem: It's not easy to know if Vim supports blowfish. (Smu Johnson) Solution: Add has('crypt-blowfish') and has('crypt-blowfish2').
-rw-r--r--src/eval.c2
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/eval.c b/src/eval.c
index ecf7a9a2f0..e97ddc4781 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -12994,6 +12994,8 @@ f_has(argvars, rettv)
#endif
#ifdef FEAT_CRYPT
"cryptv",
+ "crypt-blowfish",
+ "crypt-blowfish2",
#endif
#ifdef FEAT_CSCOPE
"cscope",
diff --git a/src/version.c b/src/version.c
index 475b4d6e8a..ab4e51f899 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1099,
+/**/
1098,
/**/
1097,