aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00
Code Activity

updated for version 7.2b-020

Browse Source
This commit is contained in:
Bram Moolenaar
2008-07-24 19:31:11 +00:00
parent e6a91fd994
commit 1387a60919
3 changed files with 27 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/charset.c
View File

@@ -1466,9 +1466,11 @@ getvcols(wp, pos1, pos2, left, right)
* skipwhite: skip over ' ' and '\t'. * skipwhite: skip over ' ' and '\t'.
*/ */
char_u * char_u *
skipwhite(p) skipwhite(q)
char_u *p; char_u *q;
{ {
char_u *p = q;
while (vim_iswhite(*p)) /* skip to next non-white */ while (vim_iswhite(*p)) /* skip to next non-white */
++p; ++p;
return p; return p;
@@ -1478,9 +1480,11 @@ skipwhite(p)
* skip over digits * skip over digits
*/ */
char_u * char_u *
skipdigits(p) skipdigits(q)
char_u *p; char_u *q;
{ {
char_u *p = q;
while (VIM_ISDIGIT(*p)) /* skip to next non-digit */ while (VIM_ISDIGIT(*p)) /* skip to next non-digit */
++p; ++p;
return p; return p;
@@ -1491,9 +1495,11 @@ skipdigits(p)
* skip over digits and hex characters * skip over digits and hex characters
*/ */
char_u * char_u *
skiphex(p) skiphex(q)
char_u *p; char_u *q;
{ {
char_u *p = q;
while (vim_isxdigit(*p)) /* skip to next non-digit */ while (vim_isxdigit(*p)) /* skip to next non-digit */
++p; ++p;
return p; return p;
@@ -1505,9 +1511,11 @@ skiphex(p)
* skip to digit (or NUL after the string) * skip to digit (or NUL after the string)
*/ */
char_u * char_u *
skiptodigit(p) skiptodigit(q)
char_u *p; char_u *q;
{ {
char_u *p = q;
while (*p != NUL && !VIM_ISDIGIT(*p)) /* skip to next digit */ while (*p != NUL && !VIM_ISDIGIT(*p)) /* skip to next digit */
++p; ++p;
return p; return p;
@@ -1517,9 +1525,11 @@ skiptodigit(p)
* skip to hex character (or NUL after the string) * skip to hex character (or NUL after the string)
*/ */
char_u * char_u *
skiptohex(p) skiptohex(q)
char_u *p; char_u *q;
{ {
char_u *p = q;
while (*p != NUL && !vim_isxdigit(*p)) /* skip to next digit */ while (*p != NUL && !vim_isxdigit(*p)) /* skip to next digit */
++p; ++p;
return p; return p;

7
src/ex_cmds.c
View File

@@ -479,10 +479,13 @@ ex_sort(eap)
c = *s2; c = *s2;
(*s2) = 0; (*s2) = 0;
/* Sorting on number: Store the number itself. */ /* Sorting on number: Store the number itself. */
p = s + start_col;
if (sort_hex) if (sort_hex)
s = skiptohex(s + start_col); s = skiptohex(p);
else else
s = skiptodigit(s + start_col); s = skiptodigit(p);
if (s > p && s[-1] == '-')
--s; /* include preceding negative sign */
vim_str2nr(s, NULL, NULL, sort_oct, sort_hex, vim_str2nr(s, NULL, NULL, sort_oct, sort_hex,
&nrs[lnum - eap->line1].start_col_nr, NULL); &nrs[lnum - eap->line1].start_col_nr, NULL);
(*s2) = c; (*s2) = c;

2
src/version.c
View File

@@ -676,6 +676,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 */
/**/
20,
/**/ /**/
19, 19,
/**/ /**/