diff options
| author | Bram Moolenaar <Bram@vim.org> | 2008-01-11 20:02:02 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2008-01-11 20:02:02 +0000 |
| commit | 426e5c9521d2045584392bb56fe76f3a9e3dcf03 (patch) | |
| tree | a9121de99f4eb1d953121989a3ff06933a1744a1 /src | |
| parent | 82ad324c8ff6d45c5b264af4f129287c51e62093 (diff) | |
updated for version 7.1-217v7.1.217
Diffstat (limited to 'src')
| -rw-r--r-- | src/ex_cmds.c | 29 | ||||
| -rw-r--r-- | src/ex_cmds.h | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 23 insertions, 10 deletions
diff --git a/src/ex_cmds.c b/src/ex_cmds.c index 29f44bd4f3..b26cfdd00c 100644 --- a/src/ex_cmds.c +++ b/src/ex_cmds.c @@ -6091,7 +6091,7 @@ ex_viusage(eap) } #if defined(FEAT_EX_EXTRA) || defined(PROTO) -static void helptags_one __ARGS((char_u *dir, char_u *ext, char_u *lang)); +static void helptags_one __ARGS((char_u *dir, char_u *ext, char_u *lang, int add_help_tags)); /* * ":helptags" @@ -6110,6 +6110,14 @@ ex_helptags(eap) char_u fname[8]; int filecount; char_u **files; + int add_help_tags = FALSE; + + /* Check for ":helptags ++t {dir}". */ + if (STRNCMP(eap->arg, "++t", 3) == 0 && vim_iswhite(eap->arg[3])) + { + add_help_tags = TRUE; + eap->arg = skipwhite(eap->arg + 3); + } if (!mch_isdir(eap->arg)) { @@ -6192,7 +6200,7 @@ ex_helptags(eap) ext[1] = fname[5]; ext[2] = fname[6]; } - helptags_one(eap->arg, ext, fname); + helptags_one(eap->arg, ext, fname, add_help_tags); } ga_clear(&ga); @@ -6200,15 +6208,16 @@ ex_helptags(eap) #else /* No language support, just use "*.txt" and "tags". */ - helptags_one(eap->arg, (char_u *)".txt", (char_u *)"tags"); + helptags_one(eap->arg, (char_u *)".txt", (char_u *)"tags", add_help_tags); #endif } static void -helptags_one(dir, ext, tagfname) - char_u *dir; /* doc directory */ - char_u *ext; /* suffix, ".txt", ".itx", ".frx", etc. */ - char_u *tagfname; /* "tags" for English, "tags-it" for Italian. */ +helptags_one(dir, ext, tagfname, add_help_tags) + char_u *dir; /* doc directory */ + char_u *ext; /* suffix, ".txt", ".itx", ".frx", etc. */ + char_u *tagfname; /* "tags" for English, "tags-fr" for French. */ + int add_help_tags; /* add "help-tags" tag */ { FILE *fd_tags; FILE *fd; @@ -6259,10 +6268,12 @@ helptags_one(dir, ext, tagfname) } /* - * If generating tags for "$VIMRUNTIME/doc" add the "help-tags" tag. + * If using the "++t" argument or generating tags for "$VIMRUNTIME/doc" + * add the "help-tags" tag. */ ga_init2(&ga, (int)sizeof(char_u *), 100); - if (fullpathcmp((char_u *)"$VIMRUNTIME/doc", dir, FALSE) == FPC_SAME) + if (add_help_tags || fullpathcmp((char_u *)"$VIMRUNTIME/doc", + dir, FALSE) == FPC_SAME) { if (ga_grow(&ga, 1) == FAIL) got_int = TRUE; diff --git a/src/ex_cmds.h b/src/ex_cmds.h index d06e031819..b9c79fce45 100644 --- a/src/ex_cmds.h +++ b/src/ex_cmds.h @@ -422,7 +422,7 @@ EX(CMD_helpfind, "helpfind", ex_helpfind, EX(CMD_helpgrep, "helpgrep", ex_helpgrep, EXTRA|NOTRLCOM|NEEDARG), EX(CMD_helptags, "helptags", ex_helptags, - NEEDARG|FILE1|TRLBAR|CMDWIN), + NEEDARG|FILES|TRLBAR|CMDWIN), EX(CMD_hardcopy, "hardcopy", ex_hardcopy, RANGE|COUNT|EXTRA|TRLBAR|DFLALL|BANG), EX(CMD_highlight, "highlight", ex_highlight, diff --git a/src/version.c b/src/version.c index ccbfc16424..467a514c12 100644 --- a/src/version.c +++ b/src/version.c @@ -667,6 +667,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 217, +/**/ 216, /**/ 215, |