Mercurial > vim
changeset 2070:4483ee552619 v7.2.355
updated for version 7.2.355
Problem: Computing the cursor column in validate_cursor_col() is wrong when
line numbers are used and 'n' is not in 'cpoptions', causing the
popup menu to be positioned wrong.
Solution: Correctly use the offset. (partly by Dominique Pelle)
| author | Bram Moolenaar <bram@zimbu.org> |
|---|---|
| date | Wed, 03 Feb 2010 17:43:07 +0100 |
| parents | 63613d8d7e4d |
| children | 8a0a8f10b43e |
| files | src/move.c src/version.c |
| diffstat | 2 files changed, 8 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/move.c +++ b/src/move.c @@ -889,6 +889,7 @@ validate_cursor_col() { colnr_T off; colnr_T col; + int width; validate_virtcol(); if (!(curwin->w_valid & VALID_WCOL)) @@ -896,15 +897,14 @@ validate_cursor_col() col = curwin->w_virtcol; off = curwin_col_off(); col += off; + width = W_WIDTH(curwin) - off + curwin_col_off2(); /* long line wrapping, adjust curwin->w_wrow */ if (curwin->w_p_wrap && col >= (colnr_T)W_WIDTH(curwin) - && W_WIDTH(curwin) - off + curwin_col_off2() > 0) - { - col -= W_WIDTH(curwin); - col = col % (W_WIDTH(curwin) - off + curwin_col_off2()); - } + && width > 0) + /* use same formula as what is used in curs_columns() */ + col -= ((col - W_WIDTH(curwin)) / width + 1) * width; if (col > (int)curwin->w_leftcol) col -= curwin->w_leftcol; else @@ -1041,6 +1041,7 @@ curs_columns(scroll) /* long line wrapping, adjust curwin->w_wrow */ if (curwin->w_wcol >= W_WIDTH(curwin)) { + /* this same formula is used in validate_cursor_col() */ n = (curwin->w_wcol - W_WIDTH(curwin)) / width + 1; curwin->w_wcol -= n * width; curwin->w_wrow += n;