aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-25 10:54:51 -04:00
Code

updated for version 7.1-222

Browse Source
This commit is contained in:
Bram Moolenaar 2008-01-13 12:31:34 +00:00
parent e77c760819
commit 0e25314f20
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/ex_cmds.c
View File

@ -6106,6 +6106,8 @@ ex_helptags(eap)
#ifdef FEAT_MULTI_LANG #ifdef FEAT_MULTI_LANG
char_u lang[2]; char_u lang[2];
#endif #endif
expand_T xpc;
char_u *dirname;
char_u ext[5]; char_u ext[5];
char_u fname[8]; char_u fname[8];
int filecount; int filecount;
@ -6119,7 +6121,11 @@ ex_helptags(eap)
eap->arg = skipwhite(eap->arg + 3); 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); EMSG2(_("E150: Not a directory: %s"), eap->arg);
return; return;
@ -6127,7 +6133,7 @@ ex_helptags(eap)
#ifdef FEAT_MULTI_LANG #ifdef FEAT_MULTI_LANG
/* Get a list of all files in the directory. */ /* Get a list of all files in the directory. */
STRCPY(NameBuff, eap->arg); STRCPY(NameBuff, dirname);
add_pathsep(NameBuff); add_pathsep(NameBuff);
STRCAT(NameBuff, "*"); STRCAT(NameBuff, "*");
if (gen_expand_wildcards(1, &NameBuff, &filecount, &files, if (gen_expand_wildcards(1, &NameBuff, &filecount, &files,
@ -6135,6 +6141,7 @@ ex_helptags(eap)
|| filecount == 0) || filecount == 0)
{ {
EMSG2("E151: No match: %s", NameBuff); EMSG2("E151: No match: %s", NameBuff);
vim_free(dirname);
return; return;
} }
@ -6200,7 +6207,7 @@ ex_helptags(eap)
ext[1] = fname[5]; ext[1] = fname[5];
ext[2] = fname[6]; ext[2] = fname[6];
} }
helptags_one(eap->arg, ext, fname, add_help_tags); helptags_one(dirname, ext, fname, add_help_tags);
} }
ga_clear(&ga); ga_clear(&ga);
@ -6208,8 +6215,9 @@ ex_helptags(eap)
#else #else
/* No language support, just use "*.txt" and "tags". */ /* 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 #endif
vim_free(dirname);
} }
static void static void

2
src/version.c
View File

@ -666,6 +666,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
222,
/**/ /**/
221, 221,
/**/ /**/