Permalink
Browse files

updated for version 7.1-217

  • Loading branch information...
1 parent 211a825 commit 8aea8c7c62da215c96cb7dc88a7e093c92d84c4a vimboss committed Jan 11, 2008
Showing with 30 additions and 13 deletions.
  1. +1 −1 runtime/doc/Makefile
  2. +6 −2 runtime/doc/various.txt
  3. +20 −9 src/ex_cmds.c
  4. +1 −1 src/ex_cmds.h
  5. +2 −0 src/version.c
View
@@ -301,7 +301,7 @@ all: tags vim.man vimdiff.man vimtutor.man xxd.man $(CONVERTED)
# Use Vim to generate the tags file. Can only be used when Vim has been
# compiled and installed. Supports multiple languages.
vimtags: $(DOCS)
- $(VIMEXE) -u NONE -esX -c "helptags ." -c quit
+ $(VIMEXE) -u NONE -esX -c "helptags ++t ." -c quit
# Use "doctags" to generate the tags file. Only works for English!
tags: doctags $(DOCS)
View
@@ -1,4 +1,4 @@
-*various.txt* For Vim version 7.1. Last change: 2007 Jan 14
+*various.txt* For Vim version 7.1. Last change: 2008 Jan 11
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -748,14 +748,18 @@ command: >
*:helpt* *:helptags*
*E154* *E150* *E151* *E152* *E153* *E670*
-:helpt[ags] {dir} Generate the help tags file(s) for directory {dir}.
+:helpt[ags] [++t] {dir}
+ Generate the help tags file(s) for directory {dir}.
All "*.txt" and "*.??x" files in the directory are
scanned for a help tag definition in between stars.
The "*.??x" files are for translated docs, they
generate the "tags-??" file, see |help-translated|.
The generated tags files are sorted.
When there are duplicates an error message is given.
An existing tags file is silently overwritten.
+ The optional "++t" argument forces adding the
+ "help-tags" tag. This is also done when the {dir} is
+ equal to $VIMRUNTIME/doc.
To rebuild the help tags in the runtime directory
(requires write permission there): >
:helptags $VIMRUNTIME/doc
View
@@ -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,23 +6200,24 @@ 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);
FreeWild(filecount, files);
#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;
View
@@ -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,
View
@@ -667,6 +667,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 217,
+/**/
216,
/**/
215,

0 comments on commit 8aea8c7

Please sign in to comment.