Replace vim_iswhite with ascii_iswhite() defined in ascii.h

This commit is contained in:
Felipe Oliveira Carvalho
2015-04-22 19:12:26 -03:00
parent d350d12a00
commit 93bf201119
33 changed files with 198 additions and 192 deletions

View File

@@ -2616,7 +2616,7 @@ static void find_first_blank(pos_T *posp)
while (decl(posp) != -1) {
c = gchar_pos(posp);
if (!vim_iswhite(c)) {
if (!ascii_iswhite(c)) {
incl(posp);
break;
}
@@ -2828,7 +2828,7 @@ extend:
decl(&pos);
while (lt(pos, curwin->w_cursor)) {
c = gchar_pos(&pos);
if (!vim_iswhite(c)) {
if (!ascii_iswhite(c)) {
at_start_sent = FALSE;
break;
}
@@ -2848,7 +2848,7 @@ extend:
if (at_start_sent)
find_first_blank(&curwin->w_cursor);
c = gchar_cursor();
if (!at_start_sent || (!include && !vim_iswhite(c)))
if (!at_start_sent || (!include && !ascii_iswhite(c)))
findsent(BACKWARD, 1L);
at_start_sent = !at_start_sent;
}
@@ -2866,7 +2866,7 @@ extend:
at_start_sent = FALSE;
while (lt(pos, curwin->w_cursor)) {
c = gchar_pos(&pos);
if (!vim_iswhite(c)) {
if (!ascii_iswhite(c)) {
at_start_sent = TRUE;
break;
}
@@ -2891,7 +2891,7 @@ extend:
* If the cursor started on a blank, check if it is just before the start
* of the next sentence.
*/
while (c = gchar_pos(&pos), vim_iswhite(c)) /* vim_iswhite() is a macro */
while (c = gchar_pos(&pos), ascii_iswhite(c))
incl(&pos);
if (equalpos(pos, curwin->w_cursor)) {
start_blank = TRUE;
@@ -2921,10 +2921,10 @@ extend:
*/
if (start_blank) {
find_first_blank(&curwin->w_cursor);
c = gchar_pos(&curwin->w_cursor); /* vim_iswhite() is a macro */
if (vim_iswhite(c))
c = gchar_pos(&curwin->w_cursor); /* ascii_iswhite() is a macro */
if (ascii_iswhite(c))
decl(&curwin->w_cursor);
} else if (c = gchar_cursor(), !vim_iswhite(c))
} else if (c = gchar_cursor(), !ascii_iswhite(c))
find_first_blank(&start_pos);
}
@@ -3231,7 +3231,7 @@ again:
*/
inc_cursor();
p = get_cursor_pos_ptr();
for (cp = p; *cp != NUL && *cp != '>' && !vim_iswhite(*cp); mb_ptr_adv(cp))
for (cp = p; *cp != NUL && *cp != '>' && !ascii_iswhite(*cp); mb_ptr_adv(cp))
;
len = (int)(cp - p);
if (len == 0) {
@@ -3679,11 +3679,11 @@ current_quote (
/* When "include" is TRUE, include spaces after closing quote or before
* the starting quote. */
if (include) {
if (vim_iswhite(line[col_end + 1]))
while (vim_iswhite(line[col_end + 1]))
if (ascii_iswhite(line[col_end + 1]))
while (ascii_iswhite(line[col_end + 1]))
++col_end;
else
while (col_start > 0 && vim_iswhite(line[col_start - 1]))
while (col_start > 0 && ascii_iswhite(line[col_start - 1]))
--col_start;
}