aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.1.2321: cannot select all text with the mouse

Browse Source 
Problem:    Cannot select all text with the mouse. (John Marriott)
Solution:   Move limiting the mouse column to f_getmousepos(). (closes #5242)
This commit is contained in:
Bram Moolenaar 2019-11-18 23:31:48 +01:00
parent f9ae154c51
commit 0a5aa7b28a
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/mouse.c
View File

@ -2822,7 +2822,6 @@ mouse_comp_pos(
int retval = FALSE; int retval = FALSE;
int off; int off;
int count; int count;
char_u *p;
#ifdef FEAT_RIGHTLEFT #ifdef FEAT_RIGHTLEFT
if (win->w_p_rl) if (win->w_p_rl)
@ -2882,11 +2881,6 @@ mouse_comp_pos(
col += row * (win->w_width - off); col += row * (win->w_width - off);
// add skip column (for long wrapping line) // add skip column (for long wrapping line)
col += win->w_skipcol; col += win->w_skipcol;
// limit to text length plus one
p = ml_get_buf(win->w_buffer, lnum, FALSE);
count = (int)STRLEN(p);
if (col > count)
col = count;
} }
if (!win->w_p_wrap) if (!win->w_p_wrap)
@ -3053,7 +3047,17 @@ f_getmousepos(typval_T *argvars UNUSED, typval_T *rettv)
col -= left_off; col -= left_off;
if (row >= 0 && row < wp->w_height && col >= 0 && col < wp->w_width) if (row >= 0 && row < wp->w_height && col >= 0 && col < wp->w_width)
{ {
char_u *p;
int count;
mouse_comp_pos(wp, &row, &col, &line, NULL); mouse_comp_pos(wp, &row, &col, &line, NULL);
// limit to text length plus one
p = ml_get_buf(wp->w_buffer, line, FALSE);
count = (int)STRLEN(p);
if (col > count)
col = count;
column = col + 1; column = col + 1;
} }
} }

2
src/version.c
View File

@ -741,6 +741,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
2321,
/**/ /**/
2320, 2320,
/**/ /**/