summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2009-03-11 14:37:32 +0000
committerBram Moolenaar <Bram@vim.org>2009-03-11 14:37:32 +0000
commit8e8fe9b2b80190f365cc07fe99aa8d4cf2168160 (patch)
treeea6062eccb44cbd253aef23fba4db3bf033e173d
parent60f39aecb1734807380432cadf094498ef5767dd (diff)
downloadvim-git-8e8fe9b2b80190f365cc07fe99aa8d4cf2168160.tar.gz
updated for version 7.2-136v7.2.136
-rw-r--r--src/ex_docmd.c4
-rw-r--r--src/version.c2
2 files changed, 6 insertions, 0 deletions
diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 4925695e4..66d7fa96c 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -7875,6 +7875,10 @@ ex_cd(eap)
else
#endif
{
+#ifdef FEAT_AUTOCMD
+ if (allbuf_locked())
+ return;
+#endif
if (vim_strchr(p_cpo, CPO_CHDIR) != NULL && curbufIsChanged()
&& !eap->forceit)
{
diff --git a/src/version.c b/src/version.c
index 8d20bf15c..e9c7a677d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -677,6 +677,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 136,
+/**/
135,
/**/
134,