1 files changed, 19 insertions, 17 deletions

diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c
index bf41e45af9..07fbf1c61a 100644
--- a/src/nvim/ex_docmd.c
+++ b/src/nvim/ex_docmd.c
@@ -1762,7 +1762,9 @@ static char_u *do_one_cmd(char_u **cmdlinep, int flags, cstack_T *cstack, LineGe
       ea.regname = *ea.arg++;
       // for '=' register: accept the rest of the line as an expression
       if (ea.arg[-1] == '=' && ea.arg[0] != NUL) {
-        set_expr_line(vim_strsave(ea.arg));
+        if (!ea.skip) {
+          set_expr_line(vim_strsave(ea.arg));
+        }
         ea.arg += STRLEN(ea.arg);
       }
       ea.arg = skipwhite(ea.arg);
@@ -7833,7 +7835,6 @@ void post_chdir(CdScope scope, bool trigger_dirchanged)
 /// @return true if the directory is successfully changed.
 bool changedir_func(char_u *new_dir, CdScope scope)
 {
-  char_u *tofree;
   char_u *pdir = NULL;
   bool retval = false;
 
@@ -7851,26 +7852,12 @@ bool changedir_func(char_u *new_dir, CdScope scope)
     new_dir = pdir;
   }
 
-  // Free the previous directory
-  tofree = get_prevdir(scope);
-
   if (os_dirname(NameBuff, MAXPATHL) == OK) {
     pdir = vim_strsave(NameBuff);
   } else {
     pdir = NULL;
   }
 
-  switch (scope) {
-  case kCdScopeTabpage:
-    curtab->tp_prevdir = pdir;
-    break;
-  case kCdScopeWindow:
-    curwin->w_prevdir = pdir;
-    break;
-  default:
-    prev_dir = pdir;
-  }
-
   // For UNIX ":cd" means: go to home directory.
   // On other systems too if 'cdhome' is set.
 #if defined(UNIX)
@@ -7886,12 +7873,27 @@ bool changedir_func(char_u *new_dir, CdScope scope)
   bool dir_differs = new_dir == NULL || pdir == NULL
                      || pathcmp((char *)pdir, (char *)new_dir, -1) != 0;
   if (new_dir != NULL && (!dir_differs || vim_chdir(new_dir) == 0)) {
+    char_u **pp;
+
+    switch (scope) {
+    case kCdScopeTabpage:
+      pp = &curtab->tp_prevdir;
+      break;
+    case kCdScopeWindow:
+      pp = &curwin->w_prevdir;
+      break;
+    default:
+      pp = &prev_dir;
+    }
+    xfree(*pp);
+    *pp = pdir;
+
     post_chdir(scope, dir_differs);
     retval = true;
   } else {
     emsg(_(e_failed));
+    xfree(pdir);
   }
-  xfree(tofree);
 
   return retval;
 }