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

revert #652

Browse Source 
reverting broad cosmetic/style change because:
- increases merge-conflicts
- increases overhead of merging upstream Vim patches
- reasons for change are ambiguous, so default to no change
This commit is contained in:
Justin M. Keyes
2014-05-01 14:00:13 -04:00
parent 3b77a62a77
commit 1b5217687a
66 changed files with 2546 additions and 2545 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/indent.c
View File

@@ -418,7 +418,7 @@ int get_number_indent(linenr_T lnum)
vim_regfree(regmatch.regprog);
}
if ((pos.lnum == 0) || (*ml_get_pos(&pos) == '\0')) {
if ((pos.lnum == 0) || (*ml_get_pos(&pos) == NUL)) {
return -1;
}
getvcol(curwin, &pos, &col, NULL, NULL);
@@ -548,29 +548,29 @@ int get_lisp_indent(void)
continue;
}
for (that = ml_get_curline(); *that != '\0'; ++that) {
for (that = ml_get_curline(); *that != NUL; ++that) {
if (*that == ';') {
while (*(that + 1) != '\0') {
while (*(that + 1) != NUL) {
that++;
}
continue;
}
if (*that == '\\') {
if (*(that + 1) != '\0') {
if (*(that + 1) != NUL) {
that++;
}
continue;
}
if ((*that == '"') && (*(that + 1) != '\0')) {
if ((*that == '"') && (*(that + 1) != NUL)) {
while (*++that && *that != '"') {
// Skipping escaped characters in the string
if (*that == '\\') {
if (*++that == '\0') {
if (*++that == NUL) {
break;
}
if (that[1] == '\0') {
if (that[1] == NUL) {
that++;
break;
}
@@ -649,7 +649,7 @@ int get_lisp_indent(void)
if (((*that == ')') || (*that == ']')) && !quotecount) {
parencount--;
}
if ((*that == '\\') && (*(that + 1) != '\0')) {
if ((*that == '\\') && (*(that + 1) != NUL)) {
amount += lbr_chartabsize_adv(&that, (colnr_T)amount);
}
@@ -684,7 +684,7 @@ static int lisp_match(char_u *p)
int len;
char_u *word = p_lispwords;
while (*word != '\0') {
while (*word != NUL) {
(void)copy_option_part(&word, buf, LSIZE, ",");
len = (int)STRLEN(buf);