updated for version 7.2-226

diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index fabb2e76a212c9922f2a9ec5aa570134af922491..68627a578b7f269417e09d341ec02f79129f2873 100644 (file)
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -4013,6 +4013,9 @@ ex_change(eap)
            break;
        ml_delete(eap->line1, FALSE);
     }
+
+    /* make sure the cursor is not beyond the end of the file now */
+    check_cursor_lnum();
     deleted_lines_mark(eap->line1, (long)(eap->line2 - lnum));
 
     /* ":append" on the line above the deleted lines. */

diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 627e5f88d57ff378e48b21117733cf4c6f0526c0..9d19fa13f17013ed4e96e008a709f57b21cc8694 100644 (file)
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -7845,10 +7845,10 @@ ex_read(eap)
                if (*ml_get(lnum) == NUL && u_savedel(lnum, 1L) == OK)
                {
                    ml_delete(lnum, FALSE);
-                   deleted_lines_mark(lnum, 1L);
                    if (curwin->w_cursor.lnum > 1
                                             && curwin->w_cursor.lnum >= lnum)
                        --curwin->w_cursor.lnum;
+                   deleted_lines_mark(lnum, 1L);
                }
            }
            redraw_curbuf_later(VALID);

diff --git a/src/if_mzsch.c b/src/if_mzsch.c
index 1658fe43e3f316672de13c0fd6d46fd1167f99f8..bc3dd6bf59bd04846c1222532b722d7ca0151ff5 100644 (file)
--- a/src/if_mzsch.c
+++ b/src/if_mzsch.c
@@ -2169,9 +2169,9 @@ set_buffer_line(void *data, int argc, Scheme_Object **argv)
            curbuf = savebuf;
            raise_vim_exn(_("cannot delete line"));
        }
-       deleted_lines_mark((linenr_T)n, 1L);
        if (buf->buf == curwin->w_buffer)
            mz_fix_cursor(n, n + 1, -1);
+       deleted_lines_mark((linenr_T)n, 1L);
 
        curbuf = savebuf;
 
@@ -2299,9 +2299,9 @@ set_buffer_line_list(void *data, int argc, Scheme_Object **argv)
                    curbuf = savebuf;
                    raise_vim_exn(_("cannot delete line"));
                }
-           deleted_lines_mark((linenr_T)lo, (long)old_len);
            if (buf->buf == curwin->w_buffer)
                mz_fix_cursor(lo, hi, -old_len);
+           deleted_lines_mark((linenr_T)lo, (long)old_len);
        }
 
        curbuf = savebuf;

diff --git a/src/if_perl.xs b/src/if_perl.xs
index d344938295d2c611a4e4864f4805ff9d0e2363bd..a589f8fd0922ce8df27f7ea05ada2e861f246f22 100644 (file)
--- a/src/if_perl.xs
+++ b/src/if_perl.xs
@@ -1233,9 +1233,8 @@ Delete(vimbuf, ...)
                    if (u_savedel(lnum, 1) == OK)
                    {
                        ml_delete(lnum, 0);
+                       check_cursor();
                        deleted_lines_mark(lnum, 1L);
-                       if (aco.save_curbuf == curbuf)
-                           check_cursor();
                    }
 
                    /* restore curwin/curbuf and a few other things */

diff --git a/src/if_python.c b/src/if_python.c
index ce9bb3eebe93de9c708136858ac8de06f04944d4..e483bfc8a8bc192b11da0c2b8ec559871e0e7182 100644 (file)
--- a/src/if_python.c
+++ b/src/if_python.c
@@ -2497,9 +2497,9 @@ SetBufferLine(buf_T *buf, PyInt n, PyObject *line, PyInt *len_change)
            PyErr_SetVim(_("cannot delete line"));
        else
        {
-           deleted_lines_mark((linenr_T)n, 1L);
            if (buf == curwin->w_buffer)
                py_fix_cursor((linenr_T)n, (linenr_T)n + 1, (linenr_T)-1);
+           deleted_lines_mark((linenr_T)n, 1L);
        }
 
        curbuf = savebuf;
@@ -2596,10 +2596,9 @@ SetBufferLineList(buf_T *buf, PyInt lo, PyInt hi, PyObject *list, PyInt *len_cha
                    break;
                }
            }
-           deleted_lines_mark((linenr_T)lo, (long)i);
-
            if (buf == curwin->w_buffer)
                py_fix_cursor((linenr_T)lo, (linenr_T)hi, (linenr_T)-n);
+           deleted_lines_mark((linenr_T)lo, (long)i);
        }
 
        curbuf = savebuf;

diff --git a/src/misc1.c b/src/misc1.c
index 03b638daa660f4933d26a5a8fe5aa2a9a51ea80a..39669b4c3290009aef7f8e98bcbd77423d3996ab 100644 (file)
--- a/src/misc1.c
+++ b/src/misc1.c
@@ -2345,12 +2345,13 @@ del_lines(nlines, undo)
     int                undo;           /* if TRUE, prepare for undo */
 {
     long       n;
+    linenr_T   first = curwin->w_cursor.lnum;
 
     if (nlines <= 0)
        return;
 
     /* save the deleted lines for undo */
-    if (undo && u_savedel(curwin->w_cursor.lnum, nlines) == FAIL)
+    if (undo && u_savedel(first, nlines) == FAIL)
        return;
 
     for (n = 0; n < nlines; )
@@ -2358,18 +2359,21 @@ del_lines(nlines, undo)
        if (curbuf->b_ml.ml_flags & ML_EMPTY)       /* nothing to delete */
            break;
 
-       ml_delete(curwin->w_cursor.lnum, TRUE);
+       ml_delete(first, TRUE);
        ++n;
 
        /* If we delete the last line in the file, stop */
-       if (curwin->w_cursor.lnum > curbuf->b_ml.ml_line_count)
+       if (first > curbuf->b_ml.ml_line_count)
            break;
     }
-    /* adjust marks, mark the buffer as changed and prepare for displaying */
-    deleted_lines_mark(curwin->w_cursor.lnum, n);
 
+    /* Correct the cursor position before calling deleted_lines_mark(), it may
+     * trigger a callback to display the cursor. */
     curwin->w_cursor.col = 0;
     check_cursor_lnum();
+
+    /* adjust marks, mark the buffer as changed and prepare for displaying */
+    deleted_lines_mark(first, n);
 }
 
     int
@@ -2621,6 +2625,8 @@ deleted_lines(lnum, count)
 
 /*
  * Like deleted_lines(), but adjust marks first.
+ * Make sure the cursor is on a valid line before calling, a GUI callback may
+ * be triggered to display the cursor.
  */
     void
 deleted_lines_mark(lnum, count)

diff --git a/src/version.c b/src/version.c
index be798216dd2269170ad5eb7d667454bdb37fe355..563991de516cd62e8b3be38aa7b854c2471c4274 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 */
+/**/
+    226,
 /**/
     225,
 /**/