mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-14 15:28:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.0.0451: some macros are in lower case

Browse Source 
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:
Jan Edmund Lazo
2018-06-11 23:43:14 -04:00
parent fa2ad305e3
commit 3c7ea8d619
33 changed files with 426 additions and 342 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/nvim/edit.c
View File

@@ -658,7 +658,7 @@ static int insert_execute(VimState *state, int key)
char_u *p;
if (str != NULL) {
for (p = str; *p != NUL; mb_ptr_adv(p)) {
for (p = str; *p != NUL; MB_PTR_ADV(p)) {
ins_compl_addleader(PTR2CHAR(p));
}
xfree(str);
@@ -1196,7 +1196,7 @@ normalchar:
if (str != NULL) {
if (*str != NUL && stop_arrow() != FAIL) {
// Insert the new value of v:char literally.
for (p = str; *p != NUL; mb_ptr_adv(p)) {
for (p = str; *p != NUL; MB_PTR_ADV(p)) {
s->c = PTR2CHAR(p);
if (s->c == CAR || s->c == K_KENTER || s->c == NL) {
ins_eol(s->c);
@@ -2008,8 +2008,8 @@ int ins_compl_add_infercase(char_u *str, int len, int icase, char_u *fname, int
const char_u *p = str;
actual_len = 0;
while (*p != NUL) {
mb_ptr_adv(p);
++actual_len;
MB_PTR_ADV(p);
actual_len++;
}
} else
actual_len = len;
@@ -2019,8 +2019,8 @@ int ins_compl_add_infercase(char_u *str, int len, int icase, char_u *fname, int
const char_u *p = compl_orig_text;
actual_compl_length = 0;
while (*p != NUL) {
mb_ptr_adv(p);
++actual_compl_length;
MB_PTR_ADV(p);
actual_compl_length++;
}
} else
actual_compl_length = compl_length;
@@ -2322,8 +2322,8 @@ static void ins_compl_longest_match(compl_T *match)
break;
}
if (has_mbyte) {
mb_ptr_adv(p);
mb_ptr_adv(s);
MB_PTR_ADV(p);
MB_PTR_ADV(s);
} else {
++p;
++s;
@@ -2974,7 +2974,7 @@ static int ins_compl_bs(void)
line = get_cursor_line_ptr();
p = line + curwin->w_cursor.col;
mb_ptr_back(line, p);
MB_PTR_BACK(line, p);
// Stop completion when the whole word was deleted. For Omni completion
// allow the word to be deleted, we won't match everything.
@@ -3440,8 +3440,9 @@ static void ins_compl_fixRedoBufForLeader(char_u *ptr_arg)
;
if (len > 0)
len -= (*mb_head_off)(p, p + len);
for (p += len; *p != NUL; mb_ptr_adv(p))
for (p += len; *p != NUL; MB_PTR_ADV(p)) {
AppendCharToRedobuff(K_BS);
}
} else {
len = 0;
}
@@ -4597,13 +4598,15 @@ static int ins_complete(int c, bool enable_pum)
if (startcol > 0) {
char_u *p = line + startcol;
mb_ptr_back(line, p);
while (p > line && vim_isfilec(PTR2CHAR(p)))
mb_ptr_back(line, p);
if (p == line && vim_isfilec(PTR2CHAR(p)))
MB_PTR_BACK(line, p);
while (p > line && vim_isfilec(PTR2CHAR(p))) {
MB_PTR_BACK(line, p);
}
if (p == line && vim_isfilec(PTR2CHAR(p))) {
startcol = 0;
else
} else {
startcol = (int)(p - line) + 1;
}
}
compl_col += startcol;