Merge #8596 from janlazo/vim-8.0.0615

src/nvim/ex_docmd.c

@@ -2317,9 +2317,9 @@ doend:
  */
 int
 checkforcmd(
-    char_u **pp,               /* start of command */
+    char_u **pp,              // start of command
-    char *cmd,               /* name of command */
+    char *cmd,                // name of command
-    int len                        /* required length */
+    int len                   // required length
 )
 {
   int i;
@@ -4080,6 +4080,7 @@ int expand_filename(exarg_T *eap, char_u **cmdlinep, char_u **errormsgp)
         && eap->cmdidx != CMD_lgrep
         && eap->cmdidx != CMD_grepadd
         && eap->cmdidx != CMD_lgrepadd
+        && eap->cmdidx != CMD_hardcopy
         && !(eap->argt & NOSPC)
         ) {
       char_u      *l;
@@ -4704,7 +4705,7 @@ char_u *check_nextcmd(char_u *p)
  */
 static int
 check_more(
-    int message,                /* when FALSE check only, no messages */
+    int message,                // when FALSE check only, no messages
     int forceit
 )
 {

src/nvim/testdir/test_hardcopy.vim

@@ -61,3 +61,14 @@ func Test_with_syntax()
     set printoptions&
   endif
 endfunc
+
+func Test_fname_with_spaces()
+  if has('postscript')
+    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!
+  endif
+endfunc