Merge #5872 justinmk/test_autochdir

src/nvim/eval.c

@@ -17265,14 +17265,6 @@ static void f_termopen(typval_T *argvars, typval_T *rettv, FunPtr fptr)
   return;
 }
 
-/*
- * "test(list)" function: Just checking the walls...
- */
-static void f_test(typval_T *argvars, typval_T *rettv, FunPtr fptr)
-{
-  /* Used for unit testing.  Change the code below to your liking. */
-}
-
 static bool callback_from_typval(Callback *callback, typval_T *arg)
 {
   if (arg->v_type == VAR_PARTIAL && arg->vval.v_partial != NULL) {

src/nvim/eval.lua

@@ -302,7 +302,6 @@ return {
     tanh={args=1, func="float_op_wrapper", data="&tanh"},
     tempname={},
     termopen={args={1, 2}},
-    test={args=1},
     timer_start={args={2,3}},
     timer_stop={args=1},
     tolower={args=1},

src/nvim/ex_cmds.c

@@ -1611,6 +1611,7 @@ int do_write(exarg_T *eap)
   int retval = FAIL;
   char_u      *free_fname = NULL;
   buf_T       *alt_buf = NULL;
+  int          name_was_missing;
 
   if (not_writing())            /* check 'write' option */
     return FAIL;
@@ -1734,6 +1735,7 @@ int do_write(exarg_T *eap)
       fname = curbuf->b_sfname;
     }
 
+    name_was_missing = curbuf->b_ffname == NULL;
     retval = buf_write(curbuf, ffname, fname, eap->line1, eap->line2,
         eap, eap->append, eap->forceit, TRUE, FALSE);
 
@@ -1743,7 +1745,11 @@ int do_write(exarg_T *eap)
         curbuf->b_p_ro = FALSE;
         redraw_tabline = TRUE;
       }
-      /* 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();
     }
   }

src/nvim/testdir/Makefile

@@ -43,8 +43,8 @@ NEW_TESTS = \
 	    test_quickfix.res \
 	    test_signs.res \
 	    test_syntax.res \
-	    test_usercommands.res \
 	    test_timers.res \
+	    test_usercommands.res \
 	    test_viml.res \
 	    test_visual.res \
 	    test_window_id.res \

src/nvim/version.c

@@ -425,7 +425,7 @@ static int included_patches[] = {
   // 2018,
   // 2017,
   // 2016 NA
-  // 2015,
+  2015,
   2014,
   2013,
   2012,
@@ -602,7 +602,7 @@ static int included_patches[] = {
   1841,
   1840,
   1839,
-  // 1838 NA
+  1838,
   1837,
   1836,
   1835,