mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-08 02:46:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.0.0448: some macros are lower case (#7936)

Browse Source 
Problem:    Some macros are in lower case, which can be confusing.
Solution:   Make a few lower case macros upper case.
b5aedf3e22

ref #6297
This commit is contained in:
KunMing Xie
2018-01-31 03:29:15 +08:00
committed by Justin M. Keyes
parent 2a1a624878
commit 8728a5d50b
14 changed files with 108 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/nvim/search.c
View File

@@ -2227,10 +2227,11 @@ int findsent(int dir, long count)
break;
found_dot = TRUE;
}
if (decl(&pos) == -1)
if (decl(&pos) == -1) {
break;
/* when going forward: Stop in front of empty line */
if (lineempty(pos.lnum) && dir == FORWARD) {
}
// when going forward: Stop in front of empty line
if (LINEEMPTY(pos.lnum) && dir == FORWARD) {
incl(&pos);
goto found;
}
@@ -2534,10 +2535,12 @@ int bck_word(long count, int bigword, int stop)
*/
while (cls() == 0) {
if (curwin->w_cursor.col == 0
&& lineempty(curwin->w_cursor.lnum))
&& LINEEMPTY(curwin->w_cursor.lnum)) {
goto finished;
if (dec_cursor() == -1) /* hit start of file, stop here */
}
if (dec_cursor() == -1) { // hit start of file, stop here
return OK;
}
}
/*
@@ -2601,10 +2604,12 @@ int end_word(long count, int bigword, int stop, int empty)
*/
while (cls() == 0) {
if (empty && curwin->w_cursor.col == 0
&& lineempty(curwin->w_cursor.lnum))
&& LINEEMPTY(curwin->w_cursor.lnum)) {
goto finished;
if (inc_cursor() == -1) /* hit end of file, stop here */
}
if (inc_cursor() == -1) { // hit end of file, stop here
return FAIL;
}
}
/*
@@ -2657,10 +2662,12 @@ bckend_word (
* Move backward to end of the previous word
*/
while (cls() == 0) {
if (curwin->w_cursor.col == 0 && lineempty(curwin->w_cursor.lnum))
if (curwin->w_cursor.col == 0 && LINEEMPTY(curwin->w_cursor.lnum)) {
break;
if ((i = dec_cursor()) == -1 || (eol && i == 1))
}
if ((i = dec_cursor()) == -1 || (eol && i == 1)) {
return OK;
}
}
}
return OK;