From 1b5217687abf8e1aeabaf4e5a64073177d56e593 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Thu, 1 May 2014 14:00:13 -0400
Subject: 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
---
 src/indent.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/indent.c')

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);
 
-- 
cgit