Mercurial > vim
changeset 3252:80c529a5650f v7.3.395
updated for version 7.3.395
Problem: "dv?bar" in the last line deletes too much and breaks undo.
Solution: Only adjust the cursor position when it's after the last line of
the buffer. Add a test. (Christian Brabandt)
author | Bram Moolenaar <bram@vim.org> |
---|---|
date | Tue, 10 Jan 2012 13:44:27 +0100 |
parents | 310d4e1c7026 |
children | 5491cf1087c5 |
files | src/ops.c src/testdir/test43.in src/testdir/test43.ok src/version.c |
diffstat | 4 files changed, 15 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ops.c +++ b/src/ops.c @@ -1961,8 +1961,8 @@ op_delete(oap) /* Special case: gH<Del> deletes the last line. */ del_lines(1L, FALSE); curwin->w_cursor = curpos; /* restore curwin->w_cursor */ - if (curwin->w_cursor.lnum > 1) - --curwin->w_cursor.lnum; + if (curwin->w_cursor.lnum > curbuf->b_ml.ml_line_count) + curwin->w_cursor.lnum = curbuf->b_ml.ml_line_count; } else { @@ -4434,7 +4434,7 @@ same_leader(lnum, leader1_len, leader1_f #endif /* - * implementation of the format operator 'gq' + * Implementation of the format operator 'gq'. */ void op_format(oap, keep_cursor)
--- a/src/testdir/test43.in +++ b/src/testdir/test43.in @@ -13,7 +13,11 @@ x/\V^aa$ x:set magic /\v(a)(b)\2\1\1/e x/\V[ab]\(\[xy]\)\1 -x:?^1?,$w! test.out +x:$ +:set undolevels=100 +dv?bar? +Yup:" +:?^1?,$w! test.out :qa! ENDTEST @@ -25,3 +29,5 @@ 5 m mm mnn mnnooo 6 x ^aa$ x 7 (a)(b) abbaa 8 axx [ab]xx +9 foobar +