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 #10311)
diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 2264350..f78e4ed 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -9349,12 +9349,15 @@
}
}
- if (empty_is_error && (resultlen == 0 || valid != VALID_HEAD + VALID_PATH))
+ if (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 (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
diff --git a/src/testdir/test_expand_func.vim b/src/testdir/test_expand_func.vim
index 59156af..d9327bf 100644
--- a/src/testdir/test_expand_func.vim
+++ b/src/testdir/test_expand_func.vim
@@ -82,7 +82,7 @@
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 @@
set verbose=1
call assert_equal("", expand('%'))
set verbose=0
+ call assert_equal("", expand('%:p'))
quit
endfunc
diff --git a/src/version.c b/src/version.c
index 31306fb..0d95a7c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -747,6 +747,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 4842,
+/**/
4841,
/**/
4840,