diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2015-12-01 11:52:56 -0500 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2015-12-01 11:52:56 -0500 |
| commit | 64a9972e7c73f61d6067f7824eb782e5a59739bd (patch) | |
| tree | ef247aefff46de055cdd9e7e7bfb8f2c305e18df | |
| parent | da9cf043a64c540afa584569c5434e2f5b7d6a90 (diff) | |
| parent | cff1e9e0b6b30c39eb49598abbda3ab099a195c3 (diff) | |
| download | rneovim-64a9972e7c73f61d6067f7824eb782e5a59739bd.tar.gz rneovim-64a9972e7c73f61d6067f7824eb782e5a59739bd.tar.bz2 rneovim-64a9972e7c73f61d6067f7824eb782e5a59739bd.zip | |
Merge pull request #3759 from Shougo/vim-7.4.617
vim-patch:7.4.617
| -rw-r--r-- | src/nvim/ex_docmd.c | 9 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c index 4b5844c5bd..59bda9345e 100644 --- a/src/nvim/ex_docmd.c +++ b/src/nvim/ex_docmd.c @@ -3446,6 +3446,7 @@ static linenr_T get_address(char_u **ptr, } if (addr_type != ADDR_LINES) { EMSG(_(e_invaddr)); + cmd = NULL; goto error; } if (skip) @@ -3473,6 +3474,7 @@ static linenr_T get_address(char_u **ptr, c = *cmd++; if (addr_type != ADDR_LINES) { EMSG(_(e_invaddr)); + cmd = NULL; goto error; } if (skip) { /* skip "/pat/" */ @@ -3516,6 +3518,7 @@ static linenr_T get_address(char_u **ptr, ++cmd; if (addr_type != ADDR_LINES) { EMSG(_(e_invaddr)); + cmd = NULL; goto error; } if (*cmd == '&') @@ -3587,7 +3590,8 @@ static linenr_T get_address(char_u **ptr, else n = getdigits(&cmd); if (addr_type == ADDR_LOADED_BUFFERS || addr_type == ADDR_BUFFERS) - lnum = compute_buffer_local_count(addr_type, lnum, (i == '-') ? -1 * n : n); + lnum = compute_buffer_local_count( + addr_type, lnum, (i == '-') ? -1 * n : n); else if (i == '-') lnum -= n; else @@ -3655,7 +3659,8 @@ static char_u *invalid_range(exarg_T *eap) } break; case ADDR_ARGUMENTS: - if (eap->line2 > ARGCOUNT + (!ARGCOUNT)) { // add 1 if ARGCOUNT is 0 + // add 1 if ARGCOUNT is 0 + if (eap->line2 > ARGCOUNT + (!ARGCOUNT)) { return (char_u *)_(e_invrange); } break; diff --git a/src/nvim/version.c b/src/nvim/version.c index d5bbd734f4..8a6a47c214 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -379,7 +379,7 @@ static int included_patches[] = { // 620, // 619 NA // 618 NA - // 617, + 617, // 616, 615, // 614, |