patch 7.4.2015

Problem:    When a file gets a name when writing it 'acd' is not effective.
            (Dan Church)
Solution:   Invoke DO_AUTOCHDIR after writing the file. (Allen Haim, closes
            #777, closes #803)  Add test_autochdir() to enable 'acd' before
            "starting" is reset.

diff --git a/src/Makefile b/src/Makefile
index 007c7925db3d375261b185c26e4505c10f003d11..24aa9ca293e990a13658763e3f16b35d2c3657e2 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -2016,6 +2016,7 @@ test1 \
 test_arglist \
        test_assert \
        test_assign \
+       test_autochdir \
        test_autocmd \
        test_backspace_opt \
        test_cdo \

diff --git a/src/buffer.c b/src/buffer.c
index 7c69b8e9d721b3fae45e0b9b23cdea86eae87b5a..b434d58e90b25dffc98cb6044f74e2280b9b9093 100644 (file)
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -1635,7 +1635,7 @@ enter_buffer(buf_T *buf)
     void
 do_autochdir(void)
 {
-    if (starting == 0
+    if ((starting == 0 || test_autochdir)
            && curbuf->b_ffname != NULL
            && vim_chdirfile(curbuf->b_ffname) == OK)
        shorten_fnames(TRUE);

diff --git a/src/eval.c b/src/eval.c
index 6e15a55df6364d7b7555cbe4bd8132fd7e7c30d1..8b67604471eabcb49e81affcafd2468cd4974603 100644 (file)
--- a/src/eval.c
+++ b/src/eval.c
@@ -812,6 +812,7 @@ static void f_taglist(typval_T *argvars, typval_T *rettv);
 static void f_tagfiles(typval_T *argvars, typval_T *rettv);
 static void f_tempname(typval_T *argvars, typval_T *rettv);
 static void f_test_alloc_fail(typval_T *argvars, typval_T *rettv);
+static void f_test_autochdir(typval_T *argvars, typval_T *rettv);
 static void f_test_disable_char_avail(typval_T *argvars, typval_T *rettv);
 static void f_test_garbagecollect_now(typval_T *argvars, typval_T *rettv);
 #ifdef FEAT_JOB_CHANNEL
@@ -8832,6 +8833,7 @@ static struct fst
 #endif
     {"tempname",       0, 0, f_tempname},
     {"test_alloc_fail",        3, 3, f_test_alloc_fail},
+    {"test_autochdir", 0, 0, f_test_autochdir},
     {"test_disable_char_avail", 1, 1, f_test_disable_char_avail},
     {"test_garbagecollect_now",        0, 0, f_test_garbagecollect_now},
 #ifdef FEAT_JOB_CHANNEL
@@ -13155,7 +13157,7 @@ f_getcwd(typval_T *argvars, typval_T *rettv)
     {
        if (wp->w_localdir != NULL)
            rettv->vval.v_string = vim_strsave(wp->w_localdir);
-       else if(globaldir != NULL)
+       else if (globaldir != NULL)
            rettv->vval.v_string = vim_strsave(globaldir);
        else
        {
@@ -21076,6 +21078,17 @@ f_test_alloc_fail(typval_T *argvars, typval_T *rettv UNUSED)
     }
 }
 
+/*
+ * "test_autochdir()"
+ */
+    static void
+f_test_autochdir(typval_T *argvars UNUSED, typval_T *rettv UNUSED)
+{
+#if defined(FEAT_AUTOCHDIR)
+    test_autochdir = TRUE;
+#endif
+}
+
 /*
  * "test_disable_char_avail({expr})" function
  */

diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index 5900c86d31bfee1ab6d96d525898e4fe402e59e5..d93a7ec7fcf476d3642f31d0f0747aefec4520e1 100644 (file)
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -3059,6 +3059,7 @@ do_write(exarg_T *eap)
     char_u     *browse_file = NULL;
 #endif
     buf_T      *alt_buf = NULL;
+    int                name_was_missing;
 
     if (not_writing())         /* check 'write' option */
        return FAIL;
@@ -3226,6 +3227,8 @@ do_write(exarg_T *eap)
 #endif
        }
 
+       name_was_missing = curbuf->b_ffname == NULL;
+
        retval = buf_write(curbuf, ffname, fname, eap->line1, eap->line2,
                                 eap, eap->append, eap->forceit, TRUE, FALSE);
 
@@ -3239,7 +3242,12 @@ do_write(exarg_T *eap)
                redraw_tabline = TRUE;
 #endif
            }
-           /* Change directories when the 'acd' option is set. */
+       }
+
+       /* Change directories when the 'acd' option is set and the file name
+        * got changed or set. */
+       if (eap->cmdidx == CMD_saveas || name_was_missing)
+       {
            DO_AUTOCHDIR
        }
     }

diff --git a/src/globals.h b/src/globals.h
index 68bf36f582314e2ad52249ef8c378bbb21c363c7..879255cd5739a1b5987a6c0c0c2c593427022a08 100644 (file)
--- a/src/globals.h
+++ b/src/globals.h
@@ -635,6 +635,9 @@ EXTERN int  exiting INIT(= FALSE);
 EXTERN int     really_exiting INIT(= FALSE);
                                /* TRUE when we are sure to exit, e.g., after
                                 * a deadly signal */
+#if defined(FEAT_AUTOCHDIR)
+EXTERN int     test_autochdir INIT(= FALSE);
+#endif
 #if defined(EXITFREE)
 EXTERN int     entered_free_all_mem INIT(= FALSE);
                                /* TRUE when in or after free_all_mem() */

diff --git a/src/testdir/Make_all.mak b/src/testdir/Make_all.mak
index 88efd19e9136a3e672de402c7e596c9181700bd8..dabf5731402e8a2b54499f0f4ee713af436ccbb4 100644 (file)
--- a/src/testdir/Make_all.mak
+++ b/src/testdir/Make_all.mak
@@ -164,6 +164,7 @@ SCRIPTS_GUI = test16.out
 # Keep test_alot*.res as the last one, sort the others.
 NEW_TESTS = test_arglist.res \
            test_assert.res \
+           test_autochdir \
            test_backspace_opt.res \
            test_cdo.res \
            test_channel.res \

diff --git a/src/testdir/test_autochdir.vim b/src/testdir/test_autochdir.vim
new file mode 100644 (file)
index 0000000..f52e2e6
--- /dev/null
+++ b/src/testdir/test_autochdir.vim
@@ -0,0 +1,17 @@
+" Test 'autochdir' behavior
+
+if !exists("+autochdir")
+  finish
+endif
+
+func Test_set_filename()
+  call test_autochdir()
+  set acd
+  new
+  w samples/Xtest
+  call assert_equal("Xtest", expand('%'))
+  call assert_equal("samples", substitute(getcwd(), '.*/\(\k*\)', '\1', ''))
+  bwipe!
+  set noacd
+  call delete('samples/Xtest')
+endfunc

diff --git a/src/version.c b/src/version.c
index 86c8c066e35759a748c24aaa18a9b2c5840c8ecc..b2dc76ec3d22ef2ef9d12495047605cb4fb94956 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -758,6 +758,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2015,
 /**/
     2014,
 /**/