Mercurial > vim
changeset 2933:0bef86c5c985 v7.3.239
updated for version 7.3.239
Problem: Python corrects the cursor column without taking 'virtualedit'
into account. (lilydjwg)
Solution: Call check_cursor_col_win().
| author | Bram Moolenaar <bram@vim.org> |
|---|---|
| date | Thu, 07 Jul 2011 15:08:58 +0200 |
| parents | 778327da6d32 |
| children | ba9df996e47c |
| files | src/if_py_both.h src/mbyte.c src/misc2.c src/normal.c src/proto/mbyte.pro src/proto/misc2.pro src/version.c |
| diffstat | 7 files changed, 40 insertions(+), 30 deletions(-) [+] |
line wrap: on
line diff
--- a/src/if_py_both.h +++ b/src/if_py_both.h @@ -534,7 +534,6 @@ WindowSetattr(PyObject *self, char *name { long lnum; long col; - long len; if (!PyArg_Parse(val, "(ll)", &lnum, &col)) return -1; @@ -549,18 +548,15 @@ WindowSetattr(PyObject *self, char *name if (VimErrorCheck()) return -1; - /* When column is out of range silently correct it. */ - len = (long)STRLEN(ml_get_buf(this->win->w_buffer, lnum, FALSE)); - if (col > len) - col = len; - this->win->w_cursor.lnum = lnum; this->win->w_cursor.col = col; #ifdef FEAT_VIRTUALEDIT this->win->w_cursor.coladd = 0; #endif + /* When column is out of range silently correct it. */ + check_cursor_col_win(this->win); + update_screen(VALID); - return 0; } else if (strcmp(name, "height") == 0)
--- a/src/mbyte.c +++ b/src/mbyte.c @@ -3563,7 +3563,7 @@ dbcs_screen_tail_off(base, p) void mb_adjust_cursor() { - mb_adjustpos(&curwin->w_cursor); + mb_adjustpos(curbuf, &curwin->w_cursor); } /* @@ -3571,7 +3571,8 @@ mb_adjust_cursor() * If it points to a tail byte it's moved backwards to the head byte. */ void -mb_adjustpos(lp) +mb_adjustpos(buf, lp) + buf_T *buf; pos_T *lp; { char_u *p; @@ -3582,7 +3583,7 @@ mb_adjustpos(lp) #endif ) { - p = ml_get(lp->lnum); + p = ml_get_buf(buf, lp->lnum, FALSE); lp->col -= (*mb_head_off)(p, p + lp->col); #ifdef FEAT_VIRTUALEDIT /* Reset "coladd" when the cursor would be on the right half of a
--- a/src/misc2.c +++ b/src/misc2.c @@ -333,7 +333,7 @@ coladvance2(pos, addspaces, finetune, wc #ifdef FEAT_MBYTE /* prevent from moving onto a trail byte */ if (has_mbyte) - mb_adjustpos(pos); + mb_adjustpos(curbuf, pos); #endif if (col < wcol) @@ -544,16 +544,26 @@ check_cursor_lnum() void check_cursor_col() { + check_cursor_col_win(curwin); +} + +/* + * Make sure win->w_cursor.col is valid. + */ + void +check_cursor_col_win(win) + win_T *win; +{ colnr_T len; #ifdef FEAT_VIRTUALEDIT - colnr_T oldcol = curwin->w_cursor.col; - colnr_T oldcoladd = curwin->w_cursor.col + curwin->w_cursor.coladd; -#endif - - len = (colnr_T)STRLEN(ml_get_curline()); + colnr_T oldcol = win->w_cursor.col; + colnr_T oldcoladd = win->w_cursor.col + win->w_cursor.coladd; +#endif + + len = (colnr_T)STRLEN(ml_get_buf(win->w_buffer, win->w_cursor.lnum, FALSE)); if (len == 0) - curwin->w_cursor.col = 0; - else if (curwin->w_cursor.col >= len) + win->w_cursor.col = 0; + else if (win->w_cursor.col >= len) { /* Allow cursor past end-of-line when: * - in Insert mode or restarting Insert mode @@ -567,33 +577,33 @@ check_cursor_col() || (ve_flags & VE_ONEMORE) #endif || virtual_active()) - curwin->w_cursor.col = len; + win->w_cursor.col = len; else { - curwin->w_cursor.col = len - 1; + win->w_cursor.col = len - 1; #ifdef FEAT_MBYTE - /* prevent cursor from moving on the trail byte */ + /* Move the cursor to the head byte. */ if (has_mbyte) - mb_adjust_cursor(); + mb_adjustpos(win->w_buffer, &win->w_cursor); #endif } } - else if (curwin->w_cursor.col < 0) - curwin->w_cursor.col = 0; + else if (win->w_cursor.col < 0) + win->w_cursor.col = 0; #ifdef FEAT_VIRTUALEDIT /* If virtual editing is on, we can leave the cursor on the old position, * only we must set it to virtual. But don't do it when at the end of the * line. */ if (oldcol == MAXCOL) - curwin->w_cursor.coladd = 0; + win->w_cursor.coladd = 0; else if (ve_flags == VE_ALL) { - if (oldcoladd > curwin->w_cursor.col) - curwin->w_cursor.coladd = oldcoladd - curwin->w_cursor.col; + if (oldcoladd > win->w_cursor.col) + win->w_cursor.coladd = oldcoladd - win->w_cursor.col; else /* avoid weird number when there is a miscalculation or overflow */ - curwin->w_cursor.coladd = 0; + win->w_cursor.coladd = 0; } #endif }
--- a/src/normal.c +++ b/src/normal.c @@ -8774,7 +8774,7 @@ unadjust_for_sel() { --pp->col; #ifdef FEAT_MBYTE - mb_adjustpos(pp); + mb_adjustpos(curbuf, pp); #endif } else if (pp->lnum > 1)
--- a/src/proto/mbyte.pro +++ b/src/proto/mbyte.pro @@ -56,7 +56,7 @@ void utf_find_illegal __ARGS((void)); int utf_valid_string __ARGS((char_u *s, char_u *end)); int dbcs_screen_tail_off __ARGS((char_u *base, char_u *p)); void mb_adjust_cursor __ARGS((void)); -void mb_adjustpos __ARGS((pos_T *lp)); +void mb_adjustpos __ARGS((buf_T *buf, pos_T *lp)); char_u *mb_prevptr __ARGS((char_u *line, char_u *p)); int mb_charlen __ARGS((char_u *str)); int mb_charlen_len __ARGS((char_u *str, int len));
--- a/src/proto/misc2.pro +++ b/src/proto/misc2.pro @@ -14,6 +14,7 @@ int decl __ARGS((pos_T *lp)); linenr_T get_cursor_rel_lnum __ARGS((win_T *wp, linenr_T lnum)); void check_cursor_lnum __ARGS((void)); void check_cursor_col __ARGS((void)); +void check_cursor_col_win __ARGS((win_T *win)); void check_cursor __ARGS((void)); void adjust_cursor_col __ARGS((void)); int leftcol_changed __ARGS((void));