diff options
Diffstat (limited to 'src/ex_docmd.c')
| -rw-r--r-- | src/ex_docmd.c | 43 |
1 files changed, 39 insertions, 4 deletions
diff --git a/src/ex_docmd.c b/src/ex_docmd.c index 7633d5420..35b6637fd 100644 --- a/src/ex_docmd.c +++ b/src/ex_docmd.c @@ -135,7 +135,7 @@ static int getargopt __ARGS((exarg_T *eap)); #endif static int check_more __ARGS((int, int)); -static linenr_T get_address __ARGS((char_u **, int addr_type, int skip, int to_other_file)); +static linenr_T get_address __ARGS((exarg_T *, char_u **, int addr_type, int skip, int to_other_file)); static void get_flags __ARGS((exarg_T *eap)); #if !defined(FEAT_PERL) \ || !defined(FEAT_PYTHON) || !defined(FEAT_PYTHON3) \ @@ -2173,9 +2173,12 @@ do_one_cmd(cmdlinep, sourcing, lnum = CURRENT_TAB_NR; ea.line2 = lnum; break; + case ADDR_QUICKFIX: + ea.line2 = qf_get_cur_valid_idx(&ea); + break; } ea.cmd = skipwhite(ea.cmd); - lnum = get_address(&ea.cmd, ea.addr_type, ea.skip, ea.addr_count == 0); + lnum = get_address(&ea, &ea.cmd, ea.addr_type, ea.skip, ea.addr_count == 0); if (ea.cmd == NULL) /* error detected */ goto doend; if (lnum == MAXLNUM) @@ -2233,6 +2236,12 @@ do_one_cmd(cmdlinep, sourcing, ea.line2 = ARGCOUNT; } break; + case ADDR_QUICKFIX: + ea.line1 = 1; + ea.line2 = qf_get_size(&ea); + if (ea.line2 == 0) + ea.line2 = 1; + break; } ++ea.addr_count; } @@ -2693,6 +2702,11 @@ do_one_cmd(cmdlinep, sourcing, else ea.line2 = ARGCOUNT; break; + case ADDR_QUICKFIX: + ea.line2 = qf_get_size(&ea); + if (ea.line2 == 0) + ea.line2 = 1; + break; } } @@ -3839,6 +3853,8 @@ set_one_cmd_context(xp, buff) case CMD_botright: case CMD_browse: case CMD_bufdo: + case CMD_cdo: + case CMD_cfdo: case CMD_confirm: case CMD_debug: case CMD_folddoclosed: @@ -3848,7 +3864,9 @@ set_one_cmd_context(xp, buff) case CMD_keepjumps: case CMD_keepmarks: case CMD_keeppatterns: + case CMD_ldo: case CMD_leftabove: + case CMD_lfdo: case CMD_lockmarks: case CMD_noautocmd: case CMD_noswapfile: @@ -4321,7 +4339,8 @@ skip_range(cmd, ctx) * Return MAXLNUM when no Ex address was found. */ static linenr_T -get_address(ptr, addr_type, skip, to_other_file) +get_address(eap, ptr, addr_type, skip, to_other_file) + exarg_T *eap; char_u **ptr; int addr_type; /* flag: one of ADDR_LINES, ... */ int skip; /* only skip the address, don't use it */ @@ -4362,6 +4381,9 @@ get_address(ptr, addr_type, skip, to_other_file) case ADDR_TABS: lnum = CURRENT_TAB_NR; break; + case ADDR_QUICKFIX: + lnum = qf_get_cur_valid_idx(eap); + break; } break; @@ -4394,6 +4416,11 @@ get_address(ptr, addr_type, skip, to_other_file) case ADDR_TABS: lnum = LAST_TAB_NR; break; + case ADDR_QUICKFIX: + lnum = qf_get_size(eap); + if (lnum == 0) + lnum = 1; + break; } break; @@ -4569,6 +4596,9 @@ get_address(ptr, addr_type, skip, to_other_file) case ADDR_TABS: lnum = CURRENT_TAB_NR; break; + case ADDR_QUICKFIX: + lnum = qf_get_cur_valid_idx(eap); + break; } } @@ -4707,6 +4737,10 @@ invalid_range(eap) if (eap->line2 > LAST_TAB_NR) return (char_u *)_(e_invrange); break; + case ADDR_QUICKFIX: + if (eap->line2 != 1 && eap->line2 > qf_get_size(eap)) + return (char_u *)_(e_invrange); + break; } } return NULL; @@ -5817,6 +5851,7 @@ static struct {ADDR_TABS, "tabs"}, {ADDR_BUFFERS, "buffers"}, {ADDR_WINDOWS, "windows"}, + {ADDR_QUICKFIX, "quickfix"}, {-1, NULL} }; #endif @@ -9224,7 +9259,7 @@ ex_copymove(eap) { long n; - n = get_address(&eap->arg, eap->addr_type, FALSE, FALSE); + n = get_address(eap, &eap->arg, eap->addr_type, FALSE, FALSE); if (eap->arg == NULL) /* error detected */ { eap->nextcmd = NULL; |