diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2016-10-25 20:42:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-25 20:42:04 +0200 |
| commit | e828a5a76b097885ebd40d636e9ea95251b2995d (patch) | |
| tree | f05ea387861273f79bc8ddec6c9892a503e64f49 /src | |
| parent | 714ec09c6d83295ef70becbbaf1c620761cbdac6 (diff) | |
| parent | e8ddbbdf07838a99545181a5f63d460f4ea7e8a4 (diff) | |
| download | rneovim-e828a5a76b097885ebd40d636e9ea95251b2995d.tar.gz rneovim-e828a5a76b097885ebd40d636e9ea95251b2995d.tar.bz2 rneovim-e828a5a76b097885ebd40d636e9ea95251b2995d.zip | |
Merge #5530 from justinmk/checkhealth
CheckHealth: more checks. Also hack around an infinite loop.
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/eval.c | 2 | ||||
| -rw-r--r-- | src/nvim/version.c | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c index 9a790c5b2a..512555eac1 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -10669,7 +10669,7 @@ static void f_has(typval_T *argvars, typval_T *rettv, FunPtr fptr) } else { n = has_vim_patch(atoi(name + 5)); } - } else if (STRNICMP(name, "nvim", 4) == 0 && name[4] == '-') { + } else if (STRNICMP(name, "nvim-", 5) == 0) { // Expect "nvim-x.y.z" n = has_nvim_version(name + 5); } else if (STRICMP(name, "vim_starting") == 0) { diff --git a/src/nvim/version.c b/src/nvim/version.c index 6b9c8bf6b1..54f03cd3dd 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -2570,7 +2570,11 @@ static void list_features(void) } } else { while (msg_col % width) { + int old_msg_col = msg_col; msg_putchar(' '); + if (old_msg_col == msg_col) { + break; // XXX: Avoid infinite loop. + } } } } else { |