# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1458927905 -3600
# Node ID c1ac169ee618b88e44ba54eb38f7640bd4b35da3
# Parent  663adb8f6065167b7fb499f3ec2f7027d0ec41f4
commit https://github.com/vim/vim/commit/52c6eaffd43a8c8865f8d6ed7cde0a8b137479e2
Author: Bram Moolenaar <Bram@vim.org>
Date:   Fri Mar 25 18:42:46 2016 +0100

    patch 7.4.1654
    Problem:    Crash when using expand('%:S') in a buffer without a name.
    Solution:   Don't set a NUL. (James McCoy, closes https://github.com/vim/vim/issues/714)

diff --git a/src/eval.c b/src/eval.c
--- a/src/eval.c
+++ b/src/eval.c
@@ -26439,9 +26439,11 @@ repeat:
     {
 	/* vim_strsave_shellescape() needs a NUL terminated string. */
 	c = (*fnamep)[*fnamelen];
-	(*fnamep)[*fnamelen] = NUL;
+	if (c != NUL)
+	    (*fnamep)[*fnamelen] = NUL;
 	p = vim_strsave_shellescape(*fnamep, FALSE, FALSE);
-	(*fnamep)[*fnamelen] = c;
+	if (c != NUL)
+	    (*fnamep)[*fnamelen] = c;
 	if (p == NULL)
 	    return -1;
 	vim_free(*bufp);
diff --git a/src/testdir/test_fnamemodify.vim b/src/testdir/test_fnamemodify.vim
--- a/src/testdir/test_fnamemodify.vim
+++ b/src/testdir/test_fnamemodify.vim
@@ -41,3 +41,9 @@ func Test_fnamemodify()
   call assert_equal("'abc\\\ndef'",  fnamemodify("abc\ndef", ':S'))
   set shell&
 endfunc
+
+func Test_expand()
+  new
+  call assert_equal("",  expand('%:S'))
+  quit
+endfunc
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -749,6 +749,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1654,
+/**/
     1653,
 /**/
     1652,