updated for version 7.2-132

diff --git a/src/ex_getln.c b/src/ex_getln.c
index ecaeb3f52973b226aa6018d6dcc0377fdaccdd42..5cda65a07e466ed91107d9d54ee8028863aab960 100644 (file)
--- a/src/ex_getln.c
+++ b/src/ex_getln.c
@@ -2000,8 +2000,8 @@ text_locked_msg()
 
 #if defined(FEAT_AUTOCMD) || defined(PROTO)
 /*
- * Check if "curbuf_lock" is set and return TRUE when it is and give an error
- * message.
+ * Check if "curbuf_lock" or "allbuf_lock" is set and return TRUE when it is
+ * and give an error message.
  */
     int
 curbuf_locked()
@@ -2011,6 +2011,21 @@ curbuf_locked()
        EMSG(_("E788: Not allowed to edit another buffer now"));
        return TRUE;
     }
+    return allbuf_locked();
+}
+
+/*
+ * Check if "allbuf_lock" is set and return TRUE when it is and give an error
+ * message.
+ */
+    int
+allbuf_locked()
+{
+    if (allbuf_lock > 0)
+    {
+       EMSG(_("E811: Not allowed to change buffer information now"));
+       return TRUE;
+    }
     return FALSE;
 }
 #endif

diff --git a/src/fileio.c b/src/fileio.c
index 76d4b8545307846d39abbe4dc432711fe6dd177a..342cf590ab50e1bdc287f4a6cab5d9fa46374354 100644 (file)
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -69,7 +69,7 @@ static int apply_autocmds_exarg __ARGS((event_T event, char_u *fname, char_u *fn
 static int au_find_group __ARGS((char_u *name));
 
 # define AUGROUP_DEFAULT    -1     /* default autocmd group */
-# define AUGROUP_ERROR     -2      /* errornouse autocmd group */
+# define AUGROUP_ERROR     -2      /* erroneous autocmd group */
 # define AUGROUP_ALL       -3      /* all autocmd groups */
 #endif
 
@@ -144,7 +144,9 @@ static int get_mac_fio_flags __ARGS((char_u *ptr));
 # endif
 #endif
 static int move_lines __ARGS((buf_T *frombuf, buf_T *tobuf));
-
+#ifdef FEAT_AUTOCMD
+static char *e_auchangedbuf = N_("E812: Autocommands changed buffer or buffer name");
+#endif
 
     void
 filemess(buf, name, s, attr)
@@ -295,6 +297,19 @@ readfile(fname, sfname, from, lines_to_skip, lines_to_read, eap, flags)
     int                conv_restlen = 0;       /* nr of bytes in conv_rest[] */
 #endif
 
+#ifdef FEAT_AUTOCMD
+    /* Remember the initial values of curbuf, curbuf->b_ffname and
+     * curbuf->b_fname to detect whether they are altered as a result of
+     * executing nasty autocommands.  Also check if "fname" and "sfname"
+     * point to one of these values. */
+    buf_T   *old_curbuf = curbuf;
+    char_u  *old_b_ffname = curbuf->b_ffname;
+    char_u  *old_b_fname = curbuf->b_fname;
+    int     using_b_ffname = (fname == curbuf->b_ffname)
+                                             || (sfname == curbuf->b_ffname);
+    int     using_b_fname = (fname == curbuf->b_fname)
+                                              || (sfname == curbuf->b_fname);
+#endif
     write_no_eol_lnum = 0;     /* in case it was set by the previous read */
 
     /*
@@ -589,7 +604,21 @@ readfile(fname, sfname, from, lines_to_skip, lines_to_read, eap, flags)
 #ifdef FEAT_QUICKFIX
                    if (!bt_dontwrite(curbuf))
 #endif
+                   {
                        check_need_swap(newfile);
+#ifdef FEAT_AUTOCMD
+                       /* SwapExists autocommand may mess things up */
+                       if (curbuf != old_curbuf
+                               || (using_b_ffname
+                                       && (old_b_ffname != curbuf->b_ffname))
+                               || (using_b_fname
+                                        && (old_b_fname != curbuf->b_fname)))
+                       {
+                           EMSG(_(e_auchangedbuf));
+                           return FAIL;
+                       }
+#endif
+                   }
                    if (dir_of_file_exists(fname))
                        filemess(curbuf, sfname, (char_u *)_("[New File]"), 0);
                    else
@@ -668,6 +697,17 @@ readfile(fname, sfname, from, lines_to_skip, lines_to_read, eap, flags)
 #endif
     {
        check_need_swap(newfile);
+#ifdef FEAT_AUTOCMD
+       if (!read_stdin && (curbuf != old_curbuf
+               || (using_b_ffname && (old_b_ffname != curbuf->b_ffname))
+               || (using_b_fname && (old_b_fname != curbuf->b_fname))))
+       {
+           EMSG(_(e_auchangedbuf));
+           if (!read_buffer)
+               close(fd);
+           return FAIL;
+       }
+#endif
 #ifdef UNIX
        /* Set swap file protection bits after creating it. */
        if (swap_mode > 0 && curbuf->b_ml.ml_mfp->mf_fname != NULL)
@@ -698,7 +738,6 @@ readfile(fname, sfname, from, lines_to_skip, lines_to_read, eap, flags)
     {
        int     m = msg_scroll;
        int     n = msg_scrolled;
-       buf_T   *old_curbuf = curbuf;
 
        /*
         * The file must be closed again, the autocommands may want to change
@@ -740,8 +779,13 @@ readfile(fname, sfname, from, lines_to_skip, lines_to_read, eap, flags)
        /*
         * Don't allow the autocommands to change the current buffer.
         * Try to re-open the file.
+        *
+        * Don't allow the autocommands to change the buffer name either
+        * (cd for example) if it invalidates fname or sfname.
         */
        if (!read_stdin && (curbuf != old_curbuf
+               || (using_b_ffname && (old_b_ffname != curbuf->b_ffname))
+               || (using_b_fname && (old_b_fname != curbuf->b_fname))
                || (fd = mch_open((char *)fname, O_RDONLY | O_EXTRA, 0)) < 0))
        {
            --no_wait_return;
@@ -6320,7 +6364,7 @@ check_timestamps(focus)
 
     if (!stuff_empty() || global_busy || !typebuf_typed()
 #ifdef FEAT_AUTOCMD
-                       || autocmd_busy || curbuf_lock > 0
+                       || autocmd_busy || curbuf_lock > 0 || allbuf_lock > 0
 #endif
                                        )
        need_check_timestamps = TRUE;           /* check later */
@@ -6522,8 +6566,10 @@ buf_check_timestamp(buf, focus)
            set_vim_var_string(VV_FCS_REASON, (char_u *)reason, -1);
            set_vim_var_string(VV_FCS_CHOICE, (char_u *)"", -1);
 # endif
+           ++allbuf_lock;
            n = apply_autocmds(EVENT_FILECHANGEDSHELL,
                                      buf->b_fname, buf->b_fname, FALSE, buf);
+           --allbuf_lock;
            busy = FALSE;
            if (n)
            {

diff --git a/src/globals.h b/src/globals.h
index 3236a1e91005b8b538f65d997ef82774ab05da22..548927afdbf8b0d1ce28e66b1a56187feffff090 100644 (file)
--- a/src/globals.h
+++ b/src/globals.h
@@ -619,6 +619,11 @@ EXTERN int textlock INIT(= 0);
 EXTERN int     curbuf_lock INIT(= 0);
                                /* non-zero when the current buffer can't be
                                 * changed.  Used for FileChangedRO. */
+EXTERN int     allbuf_lock INIT(= 0);
+                               /* non-zero when no buffer name can be
+                                * changed, no buffer can be deleted and
+                                * current directory can't be changed.
+                                * Used for SwapExists et al. */
 #endif
 #ifdef FEAT_EVAL
 # define HAVE_SANDBOX

diff --git a/src/proto/ex_getln.pro b/src/proto/ex_getln.pro
index afbf664699c3ff719b7c83c3f052fea8ff5cdecc..2750542fcfe11a1c3870233c404a050bc00b8181 100644 (file)
--- a/src/proto/ex_getln.pro
+++ b/src/proto/ex_getln.pro
@@ -4,6 +4,7 @@ char_u *getcmdline_prompt __ARGS((int firstc, char_u *prompt, int attr, int xp_c
 int text_locked __ARGS((void));
 void text_locked_msg __ARGS((void));
 int curbuf_locked __ARGS((void));
+int allbuf_locked __ARGS((void));
 char_u *getexline __ARGS((int c, void *dummy, int indent));
 char_u *getexmodeline __ARGS((int promptc, void *dummy, int indent));
 int cmdline_overstrike __ARGS((void));

diff --git a/src/version.c b/src/version.c
index a8783b9cee9b78163c371e0a77f51538cedbe2f0..4388cd2013a337fd7f41c483c8aa9b16beef8544 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 */
+/**/
+    132,
 /**/
     131,
 /**/