patch 8.0.0615: using % with :hardcopy wrongly escapes spaces

Problem:    Using % with :hardcopy wrongly escapes spaces. (Alexey Muranov)
Solution:   Expand % differently. (Christian Brabandt, closes #1682)

diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 2c9c8782e748740525e3675f1ac70046929e38fc..bf340de4057b445ec2a42bd1e6af07255c582867 100644 (file)
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -5042,6 +5042,7 @@ expand_filename(
                && eap->cmdidx != CMD_lgrep
                && eap->cmdidx != CMD_grepadd
                && eap->cmdidx != CMD_lgrepadd
+               && eap->cmdidx != CMD_hardcopy
 #ifndef UNIX
                && !(eap->argt & NOSPC)
 #endif

diff --git a/src/testdir/test_hardcopy.vim b/src/testdir/test_hardcopy.vim
index ea9790d134180a69cc7d860748aaff4949ec33a5..2a316d4f0f689830eeb17695e4312c97d47cc803 100644 (file)
--- a/src/testdir/test_hardcopy.vim
+++ b/src/testdir/test_hardcopy.vim
@@ -60,3 +60,12 @@ func Test_with_syntax()
     set printoptions&
   endif
 endfunc
+
+func Test_fname_with_spaces()
+  split t\ e\ s\ t.txt
+  call setline(1, ['just', 'some', 'text'])
+  hardcopy > %.ps
+  call assert_true(filereadable('t e s t.txt.ps'))
+  call delete('t e s t.txt.ps')
+  bwipe!
+endfunc

diff --git a/src/version.c b/src/version.c
index d312148ee88f1fcc036df9b3805907cb441de3f7..c0711fb84d7b199513bd84649ee546c09b9faad2 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    615,
 /**/
     614,
 /**/