summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2021-07-05 17:49:02 +0200
committerBram Moolenaar <Bram@vim.org>2021-07-05 17:49:02 +0200
commitf6d877975ba93fc9b4bee2c5d2aff88dbf9bea59 (patch)
tree7db003610c7d925651a19f755a6338a75948a8c9
parentd6fa7bd5b900dd363d3a824e0ebe3619a1634df6 (diff)
downloadvim-git-8.2.3109.tar.gz
patch 8.2.3109: check for $DISPLAY never failsv8.2.3109
Problem: Check for $DISPLAY never fails. Solution: Use eval().
-rw-r--r--src/testdir/check.vim2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/testdir/check.vim b/src/testdir/check.vim
index 504a1928e..6d2d564fa 100644
--- a/src/testdir/check.vim
+++ b/src/testdir/check.vim
@@ -139,7 +139,7 @@ endfunc
" Command to Check for an environment variable
command -nargs=1 CheckEnv call CheckEnv(<f-args>)
func CheckEnv(name)
- if empty('$' .. a:name)
+ if empty(eval('$' .. a:name))
throw 'Skipped: Environment variable ' .. a:name .. ' is not set'
endif
endfunc
diff --git a/src/version.c b/src/version.c
index 9b1ac9aa5..a36ec80cf 100644
--- a/src/version.c
+++ b/src/version.c
@@ -756,6 +756,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 3109,
+/**/
3108,
/**/
3107,