Merge #8596 from janlazo/vim-8.0.0615

src/nvim/ex_docmd.c

@@ -2316,10 +2316,10 @@ doend:
  * If there is a match advance "pp" to the argument and return TRUE.
  */
 int
-checkforcmd (
-    char_u **pp,               /* start of command */
-    char *cmd,               /* name of command */
-    int len                        /* required length */
+checkforcmd(
+    char_u **pp,              // start of command
+    char *cmd,                // name of command
+    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;
@@ -4703,8 +4704,8 @@ char_u *check_nextcmd(char_u *p)
  * return OK otherwise
  */
 static int
-check_more (
-    int message,                /* when FALSE check only, no messages */
+check_more(
+    int message,                // when FALSE check only, no messages
     int forceit
 )
 {
@@ -5372,7 +5373,7 @@ static size_t add_cmd_modifier(char_u *buf, char *mod_str, bool *multi_mods)
  * Returns -1 if there was no match, and only the "<" has been copied.
  */
 static size_t
-uc_check_code (
+uc_check_code(
     char_u *code,
     size_t len,
     char_u *buf,
@@ -6105,7 +6106,7 @@ static void ex_pclose(exarg_T *eap)
  * modified buffer.
  */
 static void
-ex_win_close (
+ex_win_close(
     int forceit,
     win_T *win,
     tabpage_T *tp                /* NULL or the tab page "win" is in */
@@ -6522,7 +6523,7 @@ void alist_set(alist_T *al, int count, char_u **files, int use_curbuf, int *fnum
  * "fname" must have been allocated and "al" must have been checked for room.
  */
 void
-alist_add (
+alist_add(
     alist_T *al,
     char_u *fname,
     int set_fnum                   /* 1: set buffer number; 2: re-use curbuf */
@@ -6870,7 +6871,7 @@ static void ex_edit(exarg_T *eap)
  * ":edit <file>" command and alikes.
  */
 void
-do_exedit (
+do_exedit(
     exarg_T *eap,
     win_T *old_curwin            /* curwin before doing a split or NULL */
 )
@@ -8761,7 +8762,7 @@ char_u *expand_sfile(char_u *arg)
  * Return FAIL on error, OK otherwise.
  */
 static int
-makeopens (
+makeopens(
     FILE *fd,
     char_u *dirnow            /* Current directory name */
 )
@@ -9208,7 +9209,7 @@ static int ses_do_win(win_T *wp)
  * Caller must make sure 'scrolloff' is zero.
  */
 static int
-put_view (
+put_view(
     FILE *fd,
     win_T *wp,
     int add_edit,                   /* add ":edit" command to view */
@@ -9403,7 +9404,7 @@ put_view (
  * Returns FAIL if writing fails.
  */
 static int
-ses_arglist (
+ses_arglist(
     FILE *fd,
     char *cmd,
     garray_T *gap,

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