neovim

commit d459b6687704b7d1f230d0b14c0d59f87cf5f67d
parent f1b8683b8c2f4a48d501c9dedef664f17761b8ac
Author: zeertzjq <zeertzjq@outlook.com>
Date:   Tue, 23 Aug 2022 13:31:07 +0800

vim-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 vim/vim#10311)
https://github.com/vim/vim/commit/211a5bb2353c66684f38527184a258921f95c9d9

Diffstat:
M
src/nvim/ex_docmd.c
 | 
14
++++++++------
M
src/nvim/testdir/test_expand_func.vim
 | 
3
++-

2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c
@@ -6891,12 +6891,14 @@ char_u *eval_vars(char_u *src, char_u *srcstart, size_t *usedlen, linenr_T *lnum
     }
   }
 
-  if (empty_is_error && (resultlen == 0 || valid != VALID_HEAD + VALID_PATH)) {
-    if (valid != VALID_HEAD + VALID_PATH) {
-      // xgettext:no-c-format
-      *errormsg = _("E499: Empty file name for '%' or '#', only works with \":p:h\"");
-    } else {
-      *errormsg = _("E500: Evaluates to an empty string");
+  if (resultlen == 0 || valid != VALID_HEAD + VALID_PATH) {
+    if (empty_is_error) {
+      if (valid != VALID_HEAD + VALID_PATH) {
+        // xgettext:no-c-format
+        *errormsg = _("E499: Empty file name for '%' or '#', only works with \":p:h\"");
+      } else {
+        *errormsg = _("E500: Evaluates to an empty string");
+      }
     }
     result = NULL;
   } else {
diff --git a/src/nvim/testdir/test_expand_func.vim b/src/nvim/testdir/test_expand_func.vim
@@ -107,7 +107,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.
@@ -115,6 +115,7 @@ func Test_expand()
   set verbose=1
   call assert_equal("", expand('%'))
   set verbose=0
+  call assert_equal("", expand('%:p'))
   quit
 endfunc