updated for version 7.2-222

diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 54d5b2dba75413d4adbda0ed488cf4cb81b3eaf9..47c460cef417daa80058bdb5defde4ae6a42f61d 100644 (file)
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -8686,6 +8686,8 @@ ex_mkrc(eap)
     }
 
 #ifdef FEAT_SESSION
+    /* Use the short file name until ":lcd" is used.  We also don't use the
+     * short file name when 'acd' is set, that is checked later. */
     did_lcd = FALSE;
 
     /* ":mkview" or ":mkview 9": generate file name with 'viewdir' */
@@ -10573,6 +10575,9 @@ ses_fname(fd, buf, flagp)
     if (buf->b_sfname != NULL
            && flagp == &ssop_flags
            && (ssop_flags & (SSOP_CURDIR | SSOP_SESDIR))
+#ifdef FEAT_AUTOCHDIR
+           && !p_acd
+#endif
            && !did_lcd)
        name = buf->b_sfname;
     else

diff --git a/src/version.c b/src/version.c
index 24544363861bdf84972cd7959a9eb1673328ba84..3a9524256241924f76612c1641de3abc97f57d89 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -676,6 +676,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    222,
 /**/
     221,
 /**/