mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-29 06:28:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.1.0388: cursor() and getregion() don't handle v:maxcol well (#28602)

Browse Source 
Problem:  cursor() and getregion() don't handle v:maxcol well.
Solution: Add special handling for v:maxcol like setpos() does.
          (zeertzjq)

closes: vim/vim#14698

2ffdae7948
This commit is contained in:
zeertzjq
2024-05-02 19:33:54 +08:00
committed by GitHub
parent d26943a6e1
commit c4627676f9
3 changed files with 35 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/nvim/eval/funcs.c
View File

@@ -1185,9 +1185,10 @@ static void set_cursorpos(typval_T *argvars, typval_T *rettv, bool charcol)
if (lnum > 0) {
curwin->w_cursor.lnum = lnum;
}
if (col > 0) {
curwin->w_cursor.col = col - 1;
if (col != MAXCOL && --col < 0) {
col = 0;
}
curwin->w_cursor.col = col;
curwin->w_cursor.coladd = coladd;
// Make sure the cursor is in a valid position.
@@ -2879,15 +2880,20 @@ static void f_getregion(typval_T *argvars, typval_T *rettv, EvalFuncData fptr)
semsg(_(e_invalid_line_number_nr), p1.lnum);
return;
}
if (p1.col < 1 || p1.col > ml_get_buf_len(findbuf, p1.lnum) + 1) {
if (p1.col == MAXCOL) {
p1.col = ml_get_buf_len(findbuf, p1.lnum) + 1;
} else if (p1.col < 1 || p1.col > ml_get_buf_len(findbuf, p1.lnum) + 1) {
semsg(_(e_invalid_column_number_nr), p1.col);
return;
}
if (p2.lnum < 1 || p2.lnum > findbuf->b_ml.ml_line_count) {
semsg(_(e_invalid_line_number_nr), p2.lnum);
return;
}
if (p2.col < 1 || p2.col > ml_get_buf_len(findbuf, p2.lnum) + 1) {
if (p2.col == MAXCOL) {
p2.col = ml_get_buf_len(findbuf, p2.lnum) + 1;
} else if (p2.col < 1 || p2.col > ml_get_buf_len(findbuf, p2.lnum) + 1) {
semsg(_(e_invalid_column_number_nr), p2.col);
return;
}