commit 8d5946760b26dca4f5999b58a2be62e285e8cc5f
author Bram Moolenaar <Bram@vim.org> Wed Jul 01 18:18:57 2009 +0000
committer Bram Moolenaar <Bram@vim.org> Wed Jul 01 18:18:57 2009 +0000
tree 473f03d1ab76d2ae280644d9e0a361e2bd41a59c
parent bbc936bebec333159bdf43ffbf0da18880023059

updated for version 7.2-222

src/ex_docmd.c

diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 54d5b2d..47c460c 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -8686,6 +8686,8 @@
     }
 
 #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 @@
     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