diff options
author | Justin M. Keyes <justinkz@gmail.com> | 2017-11-10 22:37:54 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-11-10 22:37:54 +0100 |
commit | f5d4da0144c97ba13f530ea7dbd50f7b9768cb34 (patch) | |
tree | 02c8c2cb07a58db80d2aec6be5655b33b25abe6d /src | |
parent | 314ff440f7130c39d7990295535a8cfde92de4ba (diff) | |
download | rneovim-f5d4da0144c97ba13f530ea7dbd50f7b9768cb34.tar.gz rneovim-f5d4da0144c97ba13f530ea7dbd50f7b9768cb34.tar.bz2 rneovim-f5d4da0144c97ba13f530ea7dbd50f7b9768cb34.zip |
:checkhealth : validate 'runtimepath' (#7526)
Diffstat (limited to 'src')
-rw-r--r-- | src/nvim/eval.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c index 0c0c03c8ed..33bea8ef87 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -22883,11 +22883,15 @@ void ex_checkhealth(exarg_T *eap) const char *vimruntime_env = os_getenv("VIMRUNTIME"); if (vimruntime_env == NULL) { EMSG(_("E5009: $VIMRUNTIME is empty or unset")); - return; } else { - EMSG2(_("E5009: Invalid $VIMRUNTIME: %s"), os_getenv("VIMRUNTIME")); - return; + bool rtp_ok = NULL != strstr((char *)p_rtp, vimruntime_env); + if (rtp_ok) { + EMSG2(_("E5009: Invalid $VIMRUNTIME: %s"), vimruntime_env); + } else { + EMSG(_("E5009: Invalid 'runtimepath'")); + } } + return; } size_t bufsize = STRLEN(eap->arg) + sizeof("call health#check('')"); |