Mercurial > vim
changeset 9931:05bfc3d37efb v7.4.2239
commit https://github.com/vim/vim/commit/9baf297c99cc35adb921bee04369499d76438889
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Aug 21 22:39:35 2016 +0200
patch 7.4.2239
Problem: Warning for missing declaration of skip_vimgrep_pat(). (John
Marriott)
Solution: Move it to another file.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sun, 21 Aug 2016 22:45:06 +0200 |
| parents | 0b494d8c3410 |
| children | 1aabb9543319 |
| files | src/ex_cmds.c src/proto/ex_cmds.pro src/proto/quickfix.pro src/quickfix.c src/version.c |
| diffstat | 5 files changed, 58 insertions(+), 56 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ex_cmds.c +++ b/src/ex_cmds.c @@ -8392,6 +8392,60 @@ ex_drop(exarg_T *eap) } #endif +#if defined(FEAT_QUICKFIX) || defined(FEAT_EVAL) || defined(PROTO) +/* + * Skip over the pattern argument of ":vimgrep /pat/[g][j]". + * Put the start of the pattern in "*s", unless "s" is NULL. + * If "flags" is not NULL put the flags in it: VGR_GLOBAL, VGR_NOJUMP. + * If "s" is not NULL terminate the pattern with a NUL. + * Return a pointer to the char just past the pattern plus flags. + */ + char_u * +skip_vimgrep_pat(char_u *p, char_u **s, int *flags) +{ + int c; + + if (vim_isIDc(*p)) + { + /* ":vimgrep pattern fname" */ + if (s != NULL) + *s = p; + p = skiptowhite(p); + if (s != NULL && *p != NUL) + *p++ = NUL; + } + else + { + /* ":vimgrep /pattern/[g][j] fname" */ + if (s != NULL) + *s = p + 1; + c = *p; + p = skip_regexp(p + 1, c, TRUE, NULL); + if (*p != c) + return NULL; + + /* Truncate the pattern. */ + if (s != NULL) + *p = NUL; + ++p; + + /* Find the flags */ + while (*p == 'g' || *p == 'j') + { + if (flags != NULL) + { + if (*p == 'g') + *flags |= VGR_GLOBAL; + else + *flags |= VGR_NOJUMP; + } + ++p; + } + } + return p; +} +#endif + #if defined(FEAT_EVAL) || defined(PROTO) /* * List v:oldfiles in a nice way.
--- a/src/proto/ex_cmds.pro +++ b/src/proto/ex_cmds.pro @@ -65,5 +65,6 @@ char_u *get_sign_name(expand_T *xp, int void set_context_in_sign_cmd(expand_T *xp, char_u *arg); void ex_smile(exarg_T *eap); void ex_drop(exarg_T *eap); +char_u *skip_vimgrep_pat(char_u *p, char_u **s, int *flags); void ex_oldfiles(exarg_T *eap); /* vim: set ft=c : */
--- a/src/proto/quickfix.pro +++ b/src/proto/quickfix.pro @@ -26,9 +26,8 @@ void ex_cc(exarg_T *eap); void ex_cnext(exarg_T *eap); void ex_cfile(exarg_T *eap); void ex_vimgrep(exarg_T *eap); -char_u *skip_vimgrep_pat(char_u *p, char_u **s, int *flags); +int get_errorlist(win_T *wp, int qf_idx, list_T *list); int get_errorlist_properties(win_T *wp, dict_T *what, dict_T *retdict); -int get_errorlist(win_T *wp, int qf_idx, list_T *list); int set_errorlist(win_T *wp, list_T *list, int action, char_u *title, dict_T *what); void ex_cbuffer(exarg_T *eap); void ex_cexpr(exarg_T *eap);
--- a/src/quickfix.c +++ b/src/quickfix.c @@ -5155,57 +5155,3 @@ ex_helpgrep(exarg_T *eap) } #endif /* FEAT_QUICKFIX */ - -#if defined(FEAT_QUICKFIX) || defined(FEAT_EVAL) || defined(PROTO) -/* - * Skip over the pattern argument of ":vimgrep /pat/[g][j]". - * Put the start of the pattern in "*s", unless "s" is NULL. - * If "flags" is not NULL put the flags in it: VGR_GLOBAL, VGR_NOJUMP. - * If "s" is not NULL terminate the pattern with a NUL. - * Return a pointer to the char just past the pattern plus flags. - */ - char_u * -skip_vimgrep_pat(char_u *p, char_u **s, int *flags) -{ - int c; - - if (vim_isIDc(*p)) - { - /* ":vimgrep pattern fname" */ - if (s != NULL) - *s = p; - p = skiptowhite(p); - if (s != NULL && *p != NUL) - *p++ = NUL; - } - else - { - /* ":vimgrep /pattern/[g][j] fname" */ - if (s != NULL) - *s = p + 1; - c = *p; - p = skip_regexp(p + 1, c, TRUE, NULL); - if (*p != c) - return NULL; - - /* Truncate the pattern. */ - if (s != NULL) - *p = NUL; - ++p; - - /* Find the flags */ - while (*p == 'g' || *p == 'j') - { - if (flags != NULL) - { - if (*p == 'g') - *flags |= VGR_GLOBAL; - else - *flags |= VGR_NOJUMP; - } - ++p; - } - } - return p; -} -#endif