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

patch 7.4.806

Browse Source 
Problem:    CTRL-A in Visual mode doesn't work properly with "alpha" in
            'nrformat'.
Solution:   Make it work. (Christian Brabandt)
This commit is contained in:
Bram Moolenaar
2015-08-04 18:23:22 +02:00
parent 29bc9db36e
commit cc218ab3ca
4 changed files with 54 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/ops.c
View File

@@ -5492,6 +5492,8 @@ do_addsub(command, Prenum1, g_cmd)
for (i = lnum; i <= lnume; i++)
{
colnr_T stop = 0;
t = curwin->w_cursor;
curwin->w_cursor.lnum = i;
ptr = ml_get_curline();
@@ -5501,30 +5503,27 @@ do_addsub(command, Prenum1, g_cmd)
continue;
if (visual)
{
if (doalp) /* search for ascii chars */
if (VIsual_mode == 'v'
&& i == lnume)
stop = curwin->w_cursor.col;
else if (VIsual_mode == Ctrl_V
&& curbuf->b_visual.vi_curswant != MAXCOL)
stop = curwin->w_cursor.col;
while (ptr[col] != NUL
&& !vim_isdigit(ptr[col])
&& !(doalp && ASCII_ISALPHA(ptr[col])))
{
while (!ASCII_ISALPHA(ptr[col]) && ptr[col])
col++;
if (col > 0 && col == stop)
break;
++col;
}
/* skip to first digit, but allow for leading '-' */
else if (dohex)
if (col > startcol && ptr[col - 1] == '-')
{
while (!(vim_isxdigit(ptr[col]) || (ptr[col] == '-'
&& vim_isxdigit(ptr[col+1]))) && ptr[col])
col++;
negative = TRUE;
was_positive = FALSE;
}
else /* decimal */
{
while (!(vim_isdigit(ptr[col]) || (ptr[col] == '-'
&& vim_isdigit(ptr[col+1]))) && ptr[col])
col++;
}
}
if (visual && ptr[col] == '-')
{
negative = TRUE;
was_positive = FALSE;
col++;
}
/*
* If a number was found, and saving for undo works, replace the number.