aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00
Code Activity

updated for version 7.3.734

Browse Source 
Problem:    Cannot put help files in a sub-directory.
Solution:   Make :helptags work for sub-directories. (Charles Campbell)
This commit is contained in:
Bram Moolenaar
2012-11-28 16:06:22 +01:00
parent 8866d277c9
commit 442b5c48fd
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/ex_cmds.c
View File

@@ -6344,10 +6344,10 @@ 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 help directory and in subdirectories. */
STRCPY(NameBuff, dirname); 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,
EW_FILE|EW_SILENT) == FAIL EW_FILE|EW_SILENT) == FAIL
|| filecount == 0) || filecount == 0)
@@ -6436,8 +6436,8 @@ ex_helptags(eap)
helptags_one(dir, ext, tagfname, add_help_tags) helptags_one(dir, ext, tagfname, add_help_tags)
char_u *dir; /* doc directory */ char_u *dir; /* doc directory */
char_u *ext; /* suffix, ".txt", ".itx", ".frx", etc. */ char_u *ext; /* suffix, ".txt", ".itx", ".frx", etc. */
char_u *tagfname; /* "tags" for English, "tags-fr" for French. */ char_u *tagfname; /* "tags" for English, "tags-fr" for French. */
int add_help_tags; /* add "help-tags" tag */ int add_help_tags; /* add "help-tags" tag */
{ {
FILE *fd_tags; FILE *fd_tags;
FILE *fd; FILE *fd;
@@ -6449,6 +6449,7 @@ helptags_one(dir, ext, tagfname, add_help_tags)
char_u *s; char_u *s;
int i; int i;
char_u *fname; char_u *fname;
int dirlen;
# ifdef FEAT_MBYTE # ifdef FEAT_MBYTE
int utf8 = MAYBE; int utf8 = MAYBE;
int this_utf8; int this_utf8;
@@ -6459,9 +6460,9 @@ helptags_one(dir, ext, tagfname, add_help_tags)
/* /*
* Find all *.txt files. * Find all *.txt files.
*/ */
dirlen = STRLEN(dir);
STRCPY(NameBuff, dir); STRCPY(NameBuff, dir);
add_pathsep(NameBuff); STRCAT(NameBuff, "/**/*");
STRCAT(NameBuff, "*");
STRCAT(NameBuff, ext); STRCAT(NameBuff, ext);
if (gen_expand_wildcards(1, &NameBuff, &filecount, &files, if (gen_expand_wildcards(1, &NameBuff, &filecount, &files,
EW_FILE|EW_SILENT) == FAIL EW_FILE|EW_SILENT) == FAIL
@@ -6522,7 +6523,7 @@ helptags_one(dir, ext, tagfname, add_help_tags)
EMSG2(_("E153: Unable to open %s for reading"), files[fi]); EMSG2(_("E153: Unable to open %s for reading"), files[fi]);
continue; continue;
} }
fname = gettail(files[fi]); fname = files[fi] + dirlen + 1;
# ifdef FEAT_MBYTE # ifdef FEAT_MBYTE
firstline = TRUE; firstline = TRUE;

2
src/version.c
View File

@@ -725,6 +725,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 */
/**/
734,
/**/ /**/
733, 733,
/**/ /**/