diff options
| author | vimboss <devnull@localhost> | 2008-01-13 12:31:34 +0000 |
|---|---|---|
| committer | vimboss <devnull@localhost> | 2008-01-13 12:31:34 +0000 |
| commit | 42d564b8e91c10f0570230066de6f4ec31c5a2c9 (patch) | |
| tree | 7a07203e9e4f7067e0a03b0f062bc103e3088ae7 | |
| parent | c2575fe3f333fc4adf95e552793c8885aabf7f39 (diff) | |
| download | vim-42d564b8e91c10f0570230066de6f4ec31c5a2c9.tar.gz | |
| -rw-r--r-- | src/ex_cmds.c | 16 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 14 insertions, 4 deletions
diff --git a/src/ex_cmds.c b/src/ex_cmds.c index b26cfdd0..46fcc912 100644 --- a/src/ex_cmds.c +++ b/src/ex_cmds.c @@ -6106,6 +6106,8 @@ ex_helptags(eap) #ifdef FEAT_MULTI_LANG char_u lang[2]; #endif + expand_T xpc; + char_u *dirname; char_u ext[5]; char_u fname[8]; int filecount; @@ -6119,7 +6121,11 @@ ex_helptags(eap) eap->arg = skipwhite(eap->arg + 3); } - if (!mch_isdir(eap->arg)) + ExpandInit(&xpc); + xpc.xp_context = EXPAND_DIRECTORIES; + dirname = ExpandOne(&xpc, eap->arg, NULL, + WILD_LIST_NOTFOUND|WILD_SILENT, WILD_EXPAND_FREE); + if (dirname == NULL || !mch_isdir(dirname)) { EMSG2(_("E150: Not a directory: %s"), eap->arg); return; @@ -6127,7 +6133,7 @@ ex_helptags(eap) #ifdef FEAT_MULTI_LANG /* Get a list of all files in the directory. */ - STRCPY(NameBuff, eap->arg); + STRCPY(NameBuff, dirname); add_pathsep(NameBuff); STRCAT(NameBuff, "*"); if (gen_expand_wildcards(1, &NameBuff, &filecount, &files, @@ -6135,6 +6141,7 @@ ex_helptags(eap) || filecount == 0) { EMSG2("E151: No match: %s", NameBuff); + vim_free(dirname); return; } @@ -6200,7 +6207,7 @@ ex_helptags(eap) ext[1] = fname[5]; ext[2] = fname[6]; } - helptags_one(eap->arg, ext, fname, add_help_tags); + helptags_one(dirname, ext, fname, add_help_tags); } ga_clear(&ga); @@ -6208,8 +6215,9 @@ ex_helptags(eap) #else /* No language support, just use "*.txt" and "tags". */ - helptags_one(eap->arg, (char_u *)".txt", (char_u *)"tags", add_help_tags); + helptags_one(dirname, (char_u *)".txt", (char_u *)"tags", add_help_tags); #endif + vim_free(dirname); } static void diff --git a/src/version.c b/src/version.c index 5765fe0d..b17e3e2c 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 */ /**/ + 222, +/**/ 221, /**/ 220, |