mirror of
https://github.com/neovim/neovim.git
synced 2025-09-11 13:58:18 +00:00
vim-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.
91acfffc1e
This commit is contained in:
@@ -406,8 +406,9 @@ static void shift_block(oparg_T *oap, int amount)
|
||||
/* If "bd.startspaces" is set, "bd.textstart" points to the character,
|
||||
* the part of which is displayed at the block's beginning. Let's start
|
||||
* searching from the next character. */
|
||||
if (bd.startspaces)
|
||||
mb_ptr_adv(non_white);
|
||||
if (bd.startspaces) {
|
||||
MB_PTR_ADV(non_white);
|
||||
}
|
||||
|
||||
/* The character's column is in "bd.start_vcol". */
|
||||
non_white_col = bd.start_vcol;
|
||||
@@ -443,7 +444,7 @@ static void shift_block(oparg_T *oap, int amount)
|
||||
if (verbatim_copy_width + incr > destination_col)
|
||||
break;
|
||||
verbatim_copy_width += incr;
|
||||
mb_ptr_adv(verbatim_copy_end);
|
||||
MB_PTR_ADV(verbatim_copy_end);
|
||||
}
|
||||
|
||||
/* If "destination_col" is different from the width of the initial
|
||||
@@ -2820,7 +2821,7 @@ void do_put(int regname, yankreg_T *reg, int dir, long count, int flags)
|
||||
}
|
||||
char_u *p = get_cursor_pos_ptr();
|
||||
if (dir == FORWARD && *p != NUL) {
|
||||
mb_ptr_adv(p);
|
||||
MB_PTR_ADV(p);
|
||||
}
|
||||
ptr = vim_strsave(p);
|
||||
ml_append(curwin->w_cursor.lnum, ptr, (colnr_T)0, false);
|
||||
@@ -2829,7 +2830,7 @@ void do_put(int regname, yankreg_T *reg, int dir, long count, int flags)
|
||||
oldp = get_cursor_line_ptr();
|
||||
p = oldp + curwin->w_cursor.col;
|
||||
if (dir == FORWARD && *p != NUL) {
|
||||
mb_ptr_adv(p);
|
||||
MB_PTR_ADV(p);
|
||||
}
|
||||
ptr = vim_strnsave(oldp, (size_t)(p - oldp));
|
||||
ml_replace(curwin->w_cursor.lnum, ptr, false);
|
||||
@@ -3632,10 +3633,10 @@ int do_join(size_t count,
|
||||
if (insert_space && currsize > 0) {
|
||||
if (has_mbyte) {
|
||||
cend = curr + currsize;
|
||||
mb_ptr_back(curr, cend);
|
||||
MB_PTR_BACK(curr, cend);
|
||||
endcurr1 = (*mb_ptr2char)(cend);
|
||||
if (cend > curr) {
|
||||
mb_ptr_back(curr, cend);
|
||||
MB_PTR_BACK(curr, cend);
|
||||
endcurr2 = (*mb_ptr2char)(cend);
|
||||
}
|
||||
} else {
|
||||
@@ -4272,7 +4273,7 @@ static void block_prep(oparg_T *oap, struct block_def *bdp, linenr_T lnum, int i
|
||||
bdp->pre_whitesp_c = 0;
|
||||
}
|
||||
prev_pstart = pstart;
|
||||
mb_ptr_adv(pstart);
|
||||
MB_PTR_ADV(pstart);
|
||||
}
|
||||
bdp->start_char_vcols = incr;
|
||||
if (bdp->start_vcol < oap->start_vcol) { /* line too short */
|
||||
|
Reference in New Issue
Block a user