From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 1 Jul 2009 18:18:57 +0000 (+0000)
Subject: updated for version 7.2-222
X-Git-Tag: v7.2.222
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8d5946760b26dca4f5999b58a2be62e285e8cc5f;p=vim

updated for version 7.2-222
---

diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 54d5b2dba..47c460cef 100644
--- 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 245443638..3a9524256 100644
--- 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,
 /**/