aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/testdir
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2019-06-14 04:38:41 -0700
committerGitHub <noreply@github.com>2019-06-14 04:38:41 -0700
commitfdbb5a8f727c8fa2f84f6ae3952598a25db37cb3 (patch)
treea5153aeadf1bae34dc775fb01186acab745e4ccc /src/nvim/testdir
parenta0496e3b76e417ed718f72665d3c3f99a385367d (diff)
parent18b031ea1d3830c8ff25f4d5ee488f68f464dbee (diff)
downloadrneovim-fdbb5a8f727c8fa2f84f6ae3952598a25db37cb3.tar.gz
rneovim-fdbb5a8f727c8fa2f84f6ae3952598a25db37cb3.tar.bz2
rneovim-fdbb5a8f727c8fa2f84f6ae3952598a25db37cb3.zip
Merge #10208 from janlazo/vim-8.0.0931
vim-patch:8.0.{931,933,953}
Diffstat (limited to 'src/nvim/testdir')
-rw-r--r--src/nvim/testdir/shared.vim4
-rw-r--r--src/nvim/testdir/test_statusline.vim3
2 files changed, 7 insertions, 0 deletions
diff --git a/src/nvim/testdir/shared.vim b/src/nvim/testdir/shared.vim
index eb6798f353..29af05fe3f 100644
--- a/src/nvim/testdir/shared.vim
+++ b/src/nvim/testdir/shared.vim
@@ -246,3 +246,7 @@ func! Screenline(lnum)
let line = join(chars, '')
return matchstr(line, '^.\{-}\ze\s*$')
endfunc
+
+func CanRunGui()
+ return has('gui') && ($DISPLAY != "" || has('gui_running'))
+endfunc
diff --git a/src/nvim/testdir/test_statusline.vim b/src/nvim/testdir/test_statusline.vim
index b86340a23a..ea29da0262 100644
--- a/src/nvim/testdir/test_statusline.vim
+++ b/src/nvim/testdir/test_statusline.vim
@@ -86,8 +86,11 @@ func Test_statusline()
call assert_match('^Xstatusline\s*$', s:get_statusline())
" %F: Full path to the file in the buffer.
+ let shellslash = &shellslash
+ set shellslash
set statusline=%F
call assert_match('/testdir/Xstatusline\s*$', s:get_statusline())
+ let &shellslash = shellslash
" %h: Help buffer flag, text is "[help]".
" %H: Help buffer flag, text is ",HLP".