Mercurial > vim
changeset 2501:c43e99e9baaf vim73
Fix: ml_get errors when using undo with 'virtualedit'.
author | Bram Moolenaar <bram@vim.org> |
---|---|
date | Sat, 07 Aug 2010 12:54:12 +0200 |
parents | 2649a1882e95 |
children | e6420d275b6a |
files | src/undo.c |
diffstat | 1 files changed, 11 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/src/undo.c +++ b/src/undo.c @@ -2591,18 +2591,21 @@ u_undoredo(undo) if (curhead->uh_cursor.lnum + 1 == curwin->w_cursor.lnum && curwin->w_cursor.lnum > 1) --curwin->w_cursor.lnum; - if (curhead->uh_cursor.lnum == curwin->w_cursor.lnum) + if (curwin->w_cursor.lnum <= curbuf->b_ml.ml_line_count) { - curwin->w_cursor.col = curhead->uh_cursor.col; + if (curhead->uh_cursor.lnum == curwin->w_cursor.lnum) + { + curwin->w_cursor.col = curhead->uh_cursor.col; #ifdef FEAT_VIRTUALEDIT - if (virtual_active() && curhead->uh_cursor_vcol >= 0) - coladvance((colnr_T)curhead->uh_cursor_vcol); + if (virtual_active() && curhead->uh_cursor_vcol >= 0) + coladvance((colnr_T)curhead->uh_cursor_vcol); + else + curwin->w_cursor.coladd = 0; +#endif + } else - curwin->w_cursor.coladd = 0; -#endif + beginline(BL_SOL | BL_FIX); } - else if (curwin->w_cursor.lnum <= curbuf->b_ml.ml_line_count) - beginline(BL_SOL | BL_FIX); else { /* We get here with the current cursor line being past the end (eg