aboutsummaryrefslogtreecommitdiff
path: root/runtime/autoload
diff options
context:
space:
mode:
Diffstat (limited to 'runtime/autoload')
-rw-r--r--runtime/autoload/health/nvim.vim8
-rw-r--r--runtime/autoload/remote/host.vim2
2 files changed, 9 insertions, 1 deletions
diff --git a/runtime/autoload/health/nvim.vim b/runtime/autoload/health/nvim.vim
index d09a714719..93660d05dc 100644
--- a/runtime/autoload/health/nvim.vim
+++ b/runtime/autoload/health/nvim.vim
@@ -4,6 +4,14 @@ function! s:check_config() abort
let ok = v:true
call health#report_start('Configuration')
+ let vimrc = empty($MYVIMRC) ? stdpath('config').'/init.vim' : $MYVIMRC
+ if !filereadable(vimrc)
+ let ok = v:false
+ let has_vim = filereadable(expand('~/.vimrc'))
+ call health#report_warn('Missing user config file: '.vimrc,
+ \[ has_vim ? ':help nvim-from-vim' : ':help init.vim' ])
+ endif
+
" If $VIM is empty we don't care. Else make sure it is valid.
if !empty($VIM) && !filereadable($VIM.'/runtime/doc/nvim.txt')
let ok = v:false
diff --git a/runtime/autoload/remote/host.vim b/runtime/autoload/remote/host.vim
index dfaab7d246..6266b312bd 100644
--- a/runtime/autoload/remote/host.vim
+++ b/runtime/autoload/remote/host.vim
@@ -114,7 +114,7 @@ function! s:RegistrationCommands(host) abort
let host_id = a:host.'-registration-clone'
call remote#host#RegisterClone(host_id, a:host)
let pattern = s:plugin_patterns[a:host]
- let paths = globpath(&rtp, 'rplugin/'.a:host.'/'.pattern, 0, 1)
+ let paths = globpath(&rtp, 'rplugin/'.a:host.'/'.pattern, 1, 1)
let paths = map(paths, 'tr(resolve(v:val),"\\","/")') " Normalize slashes #4795
let paths = uniq(sort(paths))
if empty(paths)