summaryrefslogtreecommitdiffstats
path: root/src/ex_docmd.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2009-07-01 18:18:57 +0000
committerBram Moolenaar <Bram@vim.org>2009-07-01 18:18:57 +0000
commit8d5946760b26dca4f5999b58a2be62e285e8cc5f (patch)
tree473f03d1ab76d2ae280644d9e0a361e2bd41a59c /src/ex_docmd.c
parentbbc936bebec333159bdf43ffbf0da18880023059 (diff)
updated for version 7.2-222v7.2.222
Diffstat (limited to 'src/ex_docmd.c')
-rw-r--r--src/ex_docmd.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 54d5b2dba7..47c460cef4 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