diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2016-04-27 21:54:48 -0400 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2016-04-27 21:54:48 -0400 |
| commit | c6594d73c67eb53a70f0bd6ba3802d7ed333f371 (patch) | |
| tree | a29147993b6e3ef8a76211afcbbf0aa638fb0a7e | |
| parent | 4ff793eaab23c2925704a1b8a58a0b76e4b2ce34 (diff) | |
| parent | 7209d3c59a4d7e26c96371d66144872e595098c6 (diff) | |
| download | rneovim-c6594d73c67eb53a70f0bd6ba3802d7ed333f371.tar.gz rneovim-c6594d73c67eb53a70f0bd6ba3802d7ed333f371.tar.bz2 rneovim-c6594d73c67eb53a70f0bd6ba3802d7ed333f371.zip | |
Merge pull request #4625 from brcolow/vim-7.4.1075
vim-patch: 7.4.1075
| -rw-r--r-- | src/nvim/ex_docmd.c | 7 | ||||
| -rw-r--r-- | src/nvim/version.c | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c index 1f7e2f4e2b..e334e9126d 100644 --- a/src/nvim/ex_docmd.c +++ b/src/nvim/ex_docmd.c @@ -5504,7 +5504,8 @@ int parse_addr_type_arg(char_u *value, int vallen, uint32_t *argt, int *addr_type_arg) { int i, a, b; - for (i = 0; addr_type_complete[i].expand != -1; ++i) { + + for (i = 0; addr_type_complete[i].expand != -1; i++) { a = (int)STRLEN(addr_type_complete[i].name) == vallen; b = STRNCMP(value, addr_type_complete[i].name, vallen) == 0; if (a && b) { @@ -5515,8 +5516,8 @@ int parse_addr_type_arg(char_u *value, int vallen, uint32_t *argt, if (addr_type_complete[i].expand == -1) { char_u *err = value; - for (i = 0; err[i] == NUL || !ascii_iswhite(err[i]); i++) - ; + + for (i = 0; err[i] != NUL && !ascii_iswhite(err[i]); i++) {} err[i] = NUL; EMSG2(_("E180: Invalid address type value: %s"), err); return FAIL; diff --git a/src/nvim/version.c b/src/nvim/version.c index 0639ec6faf..1714661049 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -603,8 +603,8 @@ static int included_patches[] = { // 1078 NA // 1077 NA 1076, - // 1075, - // 1074 NA + 1075, + // 1074 NA, // 1073, 1072, // 1071, |