diff options
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/autoload/health/provider.vim | 2 | ||||
| -rw-r--r-- | runtime/autoload/man.vim | 19 | ||||
| -rw-r--r-- | runtime/doc/eval.txt | 17 | ||||
| -rw-r--r-- | runtime/doc/vim_diff.txt | 3 |
4 files changed, 20 insertions, 21 deletions
diff --git a/runtime/autoload/health/provider.vim b/runtime/autoload/health/provider.vim index 417426c101..61ab957829 100644 --- a/runtime/autoload/health/provider.vim +++ b/runtime/autoload/health/provider.vim @@ -280,7 +280,7 @@ function! s:check_python(version) abort let python_bin = exepath(python_bin_name) if exists('$PATH') - for path in split($PATH, ':') + for path in split($PATH, has('win32') ? ';' : ':') let path_bin = path.'/'.python_bin_name if path_bin != python_bin && index(python_multiple, path_bin) == -1 \ && executable(path_bin) diff --git a/runtime/autoload/man.vim b/runtime/autoload/man.vim index a6be00c0a9..bd3aabf20c 100644 --- a/runtime/autoload/man.vim +++ b/runtime/autoload/man.vim @@ -55,7 +55,10 @@ function! man#open_page(count, count1, mods, ...) abort try let page = s:get_page(path) catch - close + if a:mods =~# 'tab' || !s:find_man() + " a new window was opened + close + endif call s:error(v:exception) return endtry @@ -175,13 +178,15 @@ function! s:get_path(sect, name) abort endfunction function! s:verify_exists(sect, name) abort - let path = s:get_path(a:sect, a:name) - if path !~# '^\/' - let path = s:get_path(get(b:, 'man_default_sects', ''), a:name) - if path !~# '^\/' + try + let path = s:get_path(a:sect, a:name) + catch /^command error (/ + try + let path = s:get_path(get(b:, 'man_default_sects', ''), a:name) + catch /^command error (/ let path = s:get_path('', a:name) - endif - endif + endtry + endtry " We need to extract the section from the path because sometimes " the actual section of the manpage is more specific than the section " we provided to `man`. Try ':Man 3 App::CLI'. diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt index 9aa60657e0..b729519d93 100644 --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -1686,11 +1686,7 @@ v:progname Contains the name (with path removed) with which Nvim was Read-only. *v:progpath* *progpath-variable* -v:progpath Contains the command with which Vim was invoked, including the - path. To get the full path use: > - echo exepath(v:progpath) -< NOTE: This does not work when the command is a relative path - and the current directory has changed. +v:progpath Absolute path to the current running Nvim. Read-only. *v:register* *register-variable* @@ -3104,13 +3100,10 @@ execute({command} [, {silent}]) *execute()* Note: Text attributes (highlights) are not captured. exepath({expr}) *exepath()* - If {expr} is an executable and is either an absolute path, a - relative path or found in $PATH, return the full path. - Note that the current directory is used when {expr} starts - with "./", which may be a problem for Vim: > - echo exepath(v:progpath) -< If {expr} cannot be found in $PATH or is not executable then - an empty string is returned. + Returns the full path of {expr} if it is an executable and + given as a (partial or full) path or is found in $PATH. + Returns empty string otherwise. + If {expr} starts with "./" the |current-directory| is used. *exists()* exists({expr}) The result is a Number, which is non-zero if {expr} is diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt index 20002c1118..de93aab399 100644 --- a/runtime/doc/vim_diff.txt +++ b/runtime/doc/vim_diff.txt @@ -108,12 +108,13 @@ Some `CTRL-SHIFT-...` key chords are distinguished from `CTRL-...` variants <C-Tab>, <C-S-Tab>, <C-BS>, <C-S-BS>, <C-Enter>, <C-S-Enter> Options: - 'inccommand' shows results while typing a |:substitute| command + 'inccommand' shows interactive results for |:substitute|-like commands 'statusline' supports unlimited alignment sections 'tabline' %@Func@foo%X can call any function on mouse-click Variables: |v:event| + |v:progpath| is always absolute ("full") |v:windowid| is always available (for use by external UIs) Commands: |