diff options
Diffstat (limited to 'src/nvim/ex_docmd.c')
| -rw-r--r-- | src/nvim/ex_docmd.c | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c index f4100272e1..b875aafaad 100644 --- a/src/nvim/ex_docmd.c +++ b/src/nvim/ex_docmd.c @@ -3224,8 +3224,6 @@ static linenr_T get_address(exarg_T *eap, char **ptr, cmd_addr_T addr_type, int char *cmd = skipwhite(*ptr); linenr_T lnum = MAXLNUM; do { - const int base_char = (uint8_t)(*cmd); - switch (*cmd) { case '.': // '.' - Cursor position cmd++; @@ -3502,16 +3500,10 @@ static linenr_T get_address(exarg_T *eap, char **ptr, cmd_addr_T addr_type, int } else if (addr_type == ADDR_LOADED_BUFFERS || addr_type == ADDR_BUFFERS) { lnum = compute_buffer_local_count(addr_type, lnum, (i == '-') ? -1 * n : n); } else { - // Relative line addressing: need to adjust for closed folds - // after the first address. - // Subtle difference: "number,+number" and "number,-number" - // adjusts to end of closed fold before adding/subtracting, - // while "number,.+number" adjusts to end of closed fold after - // adding to make "!!" expanded into ".,.+N" work correctly. - bool adjust_for_folding = addr_type == ADDR_LINES - && (i == '-' || i == '+') - && address_count >= 2; - if (adjust_for_folding && (i == '-' || base_char != '.')) { + // Relative line addressing: need to adjust for lines in a + // closed fold after the first address. + if (addr_type == ADDR_LINES && (i == '-' || i == '+') + && address_count >= 2) { (void)hasFolding(lnum, NULL, &lnum); } if (i == '-') { @@ -3522,11 +3514,6 @@ static linenr_T get_address(exarg_T *eap, char **ptr, cmd_addr_T addr_type, int goto error; } lnum += n; - // ".+number" rounds up to the end of a closed fold after - // adding, so that ":!!sort" sorts one closed fold. - if (adjust_for_folding && base_char == '.') { - (void)hasFolding(lnum, NULL, &lnum); - } } } } |