Mercurial > vim
changeset 28637:5cf6dee0f305 v8.2.4842
patch 8.2.4842: expand("%:p") is not empty when there is no buffer name
Commit: https://github.com/vim/vim/commit/211a5bb2353c66684f38527184a258921f95c9d9
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Apr 28 19:09:03 2022 +0100
patch 8.2.4842: expand("%:p") is not empty when there is no buffer name
Problem: expand("%:p") is not empty when there is no buffer name.
Solution: When ignoring errors still return NULL. (closes https://github.com/vim/vim/issues/10311)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Thu, 28 Apr 2022 20:15:03 +0200 |
| parents | ba9fa3a26a17 |
| children | 26369a825c26 |
| files | src/ex_docmd.c src/testdir/test_expand_func.vim src/version.c |
| diffstat | 3 files changed, 13 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ex_docmd.c +++ b/src/ex_docmd.c @@ -9349,12 +9349,15 @@ eval_vars( } } - if (empty_is_error && (resultlen == 0 || valid != VALID_HEAD + VALID_PATH)) - { - if (valid != VALID_HEAD + VALID_PATH) - *errormsg = _(e_empty_file_name_for_percent_or_hash_only_works_with_ph); - else - *errormsg = _(e_evaluates_to_an_empty_string); + if (resultlen == 0 || valid != VALID_HEAD + VALID_PATH) + { + if (empty_is_error) + { + if (valid != VALID_HEAD + VALID_PATH) + *errormsg = _(e_empty_file_name_for_percent_or_hash_only_works_with_ph); + else + *errormsg = _(e_evaluates_to_an_empty_string); + } result = NULL; } else
--- a/src/testdir/test_expand_func.vim +++ b/src/testdir/test_expand_func.vim @@ -82,7 +82,7 @@ endfunc func Test_expand() new - call assert_equal("''", expand('%:S')) + call assert_equal("", expand('%:S')) call assert_equal('3', '<slnum>'->expand()) call assert_equal(['4'], expand('<slnum>', v:false, v:true)) " Don't add any line above this, otherwise <slnum> will change. @@ -90,6 +90,7 @@ func Test_expand() set verbose=1 call assert_equal("", expand('%')) set verbose=0 + call assert_equal("", expand('%:p')) quit endfunc