updated for version 7.4.503

Problem:    Cannot append a list of lines to a file.
Solution:   Add the append option to writefile(). (Yasuhiro Matsumoto)

diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index eb7fcbcaace3979c0c528490b877a1fc37e300cf..4e349a6e0879d9f3c905faef314fab8ebfa4fea7 100644 (file)
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -2041,7 +2041,7 @@ winrestcmd()                      String  returns command to restore window sizes
 winrestview( {dict})           none    restore view of current window
 winsaveview()                  Dict    save view of current window
 winwidth( {nr})                        Number  width of window {nr}
-writefile( {list}, {fname} [, {binary}])
+writefile( {list}, {fname} [, {flags}])
                                Number  write list of lines to file {fname}
 xor( {expr}, {expr})           Number  bitwise XOR
 
@@ -6555,14 +6555,20 @@ winwidth({nr})                                          *winwidth()*
   :endif
 <
                                                        *writefile()*
-writefile({list}, {fname} [, {binary}])
+writefile({list}, {fname} [, {flags}])
                Write |List| {list} to file {fname}.  Each list item is
                separated with a NL.  Each list item must be a String or
                Number.
-               When {binary} is equal to "b" binary mode is used: There will
+               When {flags} contains "b" then binary mode is used: There will
                not be a NL after the last list item.  An empty item at the
                end does cause the last line in the file to end in a NL.
-               All NL characters are replaced with a NUL character.
+
+               When {flags} contains "a" then append mode is used, lines are
+               append to the file: >
+                       :call writefile(["foo"], "event.log", "a")
+                       :call writefile(["bar"], "event.log", "a")
+>
+<              All NL characters are replaced with a NUL character.
                Inserting CR characters needs to be done before passing {list}
                to writefile().
                An existing file is overwritten, if possible.

diff --git a/src/Makefile b/src/Makefile
index cfdca44fcdbc9f6abc8719e536f8547e01b29782..39e2de99f9b22859a90a09f536acd5e57a9f94e4 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -1899,8 +1899,12 @@ test1 test2 test3 test4 test5 test6 test7 test8 test9 \
        test_insertcount \
        test_listlbr \
        test_listlbr_utf8 \
+       test_mapping \
        test_options \
        test_qf_title \
+       test_signs \
+       test_utf8 \
+       test_writefile \
        test10 test11 test12 test13 test14 test15 test16 test17 test18 test19 \
        test20 test21 test22 test23 test24 test25 test26 test27 test28 test29 \
        test30 test31 test32 test33 test34 test35 test36 test37 test38 test39 \

diff --git a/src/eval.c b/src/eval.c
index ecc5e3a572770fffa1794c7ef775498601d34509..ba456f2bc2808dbd1e970e7377b25df2e0fd07ad 100644 (file)
--- a/src/eval.c
+++ b/src/eval.c
@@ -19689,6 +19689,7 @@ f_writefile(argvars, rettv)
     typval_T   *rettv;
 {
     int                binary = FALSE;
+    int                append = FALSE;
     char_u     *fname;
     FILE       *fd;
     int                ret = 0;
@@ -19704,14 +19705,19 @@ f_writefile(argvars, rettv)
     if (argvars[0].vval.v_list == NULL)
        return;
 
-    if (argvars[2].v_type != VAR_UNKNOWN
-                             && STRCMP(get_tv_string(&argvars[2]), "b") == 0)
-       binary = TRUE;
+    if (argvars[2].v_type != VAR_UNKNOWN)
+    {
+       if (vim_strchr(get_tv_string(&argvars[2]), 'b') != NULL)
+           binary = TRUE;
+       if (vim_strchr(get_tv_string(&argvars[2]), 'a') != NULL)
+           append = TRUE;
+    }
 
     /* Always open the file in binary mode, library functions have a mind of
      * their own about CR-LF conversion. */
     fname = get_tv_string(&argvars[1]);
-    if (*fname == NUL || (fd = mch_fopen((char *)fname, WRITEBIN)) == NULL)
+    if (*fname == NUL || (fd = mch_fopen((char *)fname,
+                                     append ? APPENDBIN : WRITEBIN)) == NULL)
     {
        EMSG2(_(e_notcreate), *fname == NUL ? (char_u *)_("<empty>") : fname);
        ret = -1;

diff --git a/src/testdir/test_writefile.in b/src/testdir/test_writefile.in
new file mode 100644 (file)
index 0000000..f2dc7d5
--- /dev/null
+++ b/src/testdir/test_writefile.in
@@ -0,0 +1,18 @@
+Tests for writefile()
+
+STARTTEST
+:source small.vim
+:%delete _
+:let f = tempname()
+:call writefile(["over","written"], f, "b")
+:call writefile(["hello","world"], f, "b")
+:call writefile(["!", "good"], f, "a")
+:call writefile(["morning"], f, "ab")
+:call writefile(["", "vimmers"], f, "ab")
+:bwipeout!
+:$put =readfile(f)
+:1 delete _
+:w! test.out
+:qa!
+ENDTEST
+

diff --git a/src/testdir/test_writefile.ok b/src/testdir/test_writefile.ok
new file mode 100644 (file)
index 0000000..dfb6a2b
--- /dev/null
+++ b/src/testdir/test_writefile.ok
@@ -0,0 +1,5 @@
+hello
+world!
+good
+morning
+vimmers

diff --git a/src/version.c b/src/version.c
index 7bc7153f77660c60a2a0fa2185c1e2e753a3a447..f9c0ece552f047ae8f578303aefd5ba1a9c5c0b1 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    503,
 /**/
     502,
 /**/