aboutsummaryrefslogtreecommitdiff
path: root/src/indent.c
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2014-05-01 14:00:13 -0400
committerJustin M. Keyes <justinkz@gmail.com>2014-05-01 14:00:31 -0400
commit1b5217687abf8e1aeabaf4e5a64073177d56e593 (patch)
treece4bac12fff08088724bee38bee9d96d33bfe416 /src/indent.c
parent3b77a62a77970a1c1aff5d50df396171ce24b464 (diff)
downloadrneovim-1b5217687abf8e1aeabaf4e5a64073177d56e593.tar.gz
rneovim-1b5217687abf8e1aeabaf4e5a64073177d56e593.tar.bz2
rneovim-1b5217687abf8e1aeabaf4e5a64073177d56e593.zip
revert #652
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
Diffstat (limited to 'src/indent.c')
-rw-r--r--src/indent.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/indent.c b/src/indent.c
index 05db6838b7..10530b71f8 100644
--- a/src/indent.c
+++ b/src/indent.c
@@ -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);