Mercurial > vim
comparison src/screen.c @ 11127:506f5d8b7d8b v8.0.0451
patch 8.0.0451: some macros are in lower case
commit https://github.com/vim/vim/commit/91acfffc1e6c0d8c2abfb186a0e79a5bf19c3f3f
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Mar 12 19:22:36 2017 +0100
patch 8.0.0451: some macros are in lower case
Problem: Some macros are in lower case.
Solution: Make a few more macros upper case. Avoid lower case macros use an
argument twice.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sun, 12 Mar 2017 19:30:05 +0100 |
| parents | 778c10516955 |
| children | f4ea50924c6d |
comparison
equal
deleted
inserted
replaced
| 11126:48599a3eae0b | 11127:506f5d8b7d8b |
|---|---|
| 3395 c = win_lbr_chartabsize(wp, line, ptr, (colnr_T)vcol, NULL); | 3395 c = win_lbr_chartabsize(wp, line, ptr, (colnr_T)vcol, NULL); |
| 3396 vcol += c; | 3396 vcol += c; |
| 3397 #ifdef FEAT_MBYTE | 3397 #ifdef FEAT_MBYTE |
| 3398 prev_ptr = ptr; | 3398 prev_ptr = ptr; |
| 3399 #endif | 3399 #endif |
| 3400 mb_ptr_adv(ptr); | 3400 MB_PTR_ADV(ptr); |
| 3401 } | 3401 } |
| 3402 | 3402 |
| 3403 /* When: | 3403 /* When: |
| 3404 * - 'cuc' is set, or | 3404 * - 'cuc' is set, or |
| 3405 * - 'colorcolumn' is set, or | 3405 * - 'colorcolumn' is set, or |
| 4552 #ifdef FEAT_LINEBREAK | 4552 #ifdef FEAT_LINEBREAK |
| 4553 /* | 4553 /* |
| 4554 * Found last space before word: check for line break. | 4554 * Found last space before word: check for line break. |
| 4555 */ | 4555 */ |
| 4556 if (wp->w_p_lbr && c0 == c | 4556 if (wp->w_p_lbr && c0 == c |
| 4557 && vim_isbreak(c) && !vim_isbreak(*ptr)) | 4557 && VIM_ISBREAK(c) && !VIM_ISBREAK(*ptr)) |
| 4558 { | 4558 { |
| 4559 # ifdef FEAT_MBYTE | 4559 # ifdef FEAT_MBYTE |
| 4560 int mb_off = has_mbyte ? (*mb_head_off)(line, ptr - 1) : 0; | 4560 int mb_off = has_mbyte ? (*mb_head_off)(line, ptr - 1) : 0; |
| 4561 # endif | 4561 # endif |
| 4562 char_u *p = ptr - ( | 4562 char_u *p = ptr - ( |
| 6406 | 6406 |
| 6407 while (*s != NUL) | 6407 while (*s != NUL) |
| 6408 { | 6408 { |
| 6409 s += skip_status_match_char(xp, s); | 6409 s += skip_status_match_char(xp, s); |
| 6410 len += ptr2cells(s); | 6410 len += ptr2cells(s); |
| 6411 mb_ptr_adv(s); | 6411 MB_PTR_ADV(s); |
| 6412 } | 6412 } |
| 6413 | 6413 |
| 6414 return len; | 6414 return len; |
| 6415 } | 6415 } |
| 6416 | 6416 |
| 10467 #ifdef FEAT_MBYTE | 10467 #ifdef FEAT_MBYTE |
| 10468 if (has_mbyte) | 10468 if (has_mbyte) |
| 10469 while (len > room) | 10469 while (len > room) |
| 10470 { | 10470 { |
| 10471 len -= ptr2cells(p); | 10471 len -= ptr2cells(p); |
| 10472 mb_ptr_adv(p); | 10472 MB_PTR_ADV(p); |
| 10473 } | 10473 } |
| 10474 else | 10474 else |
| 10475 #endif | 10475 #endif |
| 10476 if (len > room) | 10476 if (len > room) |
| 10477 { | 10477 { |