diff options
author | Justin M. Keyes <justinkz@gmail.com> | 2014-05-01 14:00:13 -0400 |
---|---|---|
committer | Justin M. Keyes <justinkz@gmail.com> | 2014-05-01 14:00:31 -0400 |
commit | 1b5217687abf8e1aeabaf4e5a64073177d56e593 (patch) | |
tree | ce4bac12fff08088724bee38bee9d96d33bfe416 /src/version.c | |
parent | 3b77a62a77970a1c1aff5d50df396171ce24b464 (diff) | |
download | rneovim-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/version.c')
-rw-r--r-- | src/version.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/version.c b/src/version.c index 4cc0636d2b..761ddfa96b 100644 --- a/src/version.c +++ b/src/version.c @@ -520,7 +520,7 @@ int has_patch(int n) void ex_version(exarg_T *eap) { // Ignore a ":version 9.99" command. - if (*eap->arg == '\0') { + if (*eap->arg == NUL) { msg_putchar('\n'); list_version(); } @@ -642,15 +642,15 @@ void list_version(void) #ifdef HAVE_PATHDEF - if ((*compiled_user != '\0') || (*compiled_sys != '\0')) { + if ((*compiled_user != NUL) || (*compiled_sys != NUL)) { MSG_PUTS(_("\nCompiled ")); - if (*compiled_user != '\0') { + if (*compiled_user != NUL) { MSG_PUTS(_("by ")); MSG_PUTS(compiled_user); } - if (*compiled_sys != '\0') { + if (*compiled_sys != NUL) { MSG_PUTS("@"); MSG_PUTS(compiled_sys); } @@ -695,13 +695,13 @@ void list_version(void) #endif // ifdef USR_EXRC_FILE2 #ifdef HAVE_PATHDEF - if (*default_vim_dir != '\0') { + if (*default_vim_dir != NUL) { version_msg(_(" fall-back for $VIM: \"")); version_msg((char *)default_vim_dir); version_msg("\"\n"); } - if (*default_vimruntime_dir != '\0') { + if (*default_vimruntime_dir != NUL) { version_msg(_(" f-b for $VIMRUNTIME: \"")); version_msg((char *)default_vimruntime_dir); version_msg("\"\n"); @@ -835,7 +835,7 @@ void intro_message(int colon) } } - if (*p != '\0') { + if (*p != NUL) { do_intro_line(row, (char_u *)_(p), i == 2, 0); } row++; @@ -893,10 +893,10 @@ static void do_intro_line(int row, char_u *mesg, int add_version, int attr) } // Split up in parts to highlight <> items differently. - for (p = mesg; *p != '\0'; p += l) { + for (p = mesg; *p != NUL; p += l) { clen = 0; - for (l = 0; p[l] != '\0' + for (l = 0; p[l] != NUL && (l == 0 || (p[l] != '<' && p[l - 1] != '>')); ++l) { if (has_mbyte) { clen += ptr2cells(p + l); |