aboutsummaryrefslogtreecommitdiff
path: root/runtime/menu.vim
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2017-02-28 09:57:46 +0100
committerGitHub <noreply@github.com>2017-02-28 09:57:46 +0100
commit2872e57af26685cd485c7419ffaccee779927a1b (patch)
tree3288f0c6b69552e19d8de4014194a1b60c97bcfc /runtime/menu.vim
parent5ed753044d650e7c2c0b65f0b04831097078d48a (diff)
parentadc6e636fea64a432656d747f3979d682c94d6e2 (diff)
downloadrneovim-2872e57af26685cd485c7419ffaccee779927a1b.tar.gz
rneovim-2872e57af26685cd485c7419ffaccee779927a1b.tar.bz2
rneovim-2872e57af26685cd485c7419ffaccee779927a1b.zip
Merge #6191 from jamessan/vim-42ebd06
vim-patch:42ebd06,7.4.2098,6f1d9a0,7.4.2095
Diffstat (limited to 'runtime/menu.vim')
-rw-r--r--runtime/menu.vim4
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/menu.vim b/runtime/menu.vim
index 5cbc0faabd..4971baa936 100644
--- a/runtime/menu.vim
+++ b/runtime/menu.vim
@@ -188,7 +188,7 @@ an 20.435 &Edit.Startup\ &Settings :call <SID>EditVimrc()<CR>
fun! s:EditVimrc()
if $MYVIMRC != ''
let fname = $MYVIMRC
- elseif has("win32") || has("dos32") || has("dos16")
+ elseif has("win32")
if $HOME != ''
let fname = $HOME . "/_vimrc"
else
@@ -552,7 +552,7 @@ endfun
func! s:XxdFind()
if !exists("g:xxdprogram")
" On the PC xxd may not be in the path but in the install directory
- if (has("win32") || has("dos32")) && !executable("xxd")
+ if has("win32") && !executable("xxd")
let g:xxdprogram = $VIMRUNTIME . (&shellslash ? '/' : '\') . "xxd.exe"
else
let g:xxdprogram = "xxd"