From fee0526a189f43e8470d78e8374bd425890fbe6f Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Fri, 15 Jan 2016 10:54:03 +0200 Subject: [PATCH] Unhide the --no-line-directive option to 'etags' * lib-src/etags.c (print_help): Un-undocument the --no-line-directive option. (Bug#22306) * doc/man/etags.1: Document the --no-line-directive option. --- doc/man/etags.1 | 12 +++++++++--- lib-src/etags.c | 3 +-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/doc/man/etags.1 b/doc/man/etags.1 index 7d5d374f99a..d34063f23cd 100644 --- a/doc/man/etags.1 +++ b/doc/man/etags.1 @@ -17,7 +17,7 @@ etags, ctags \- generate tag file for Emacs, vi [\|\-\-parse\-stdin=\fIfile\fP\|] .br [\|\-\-append\|] [\|\-\-no\-defines\|] [\|\-\-globals\|] -[\|\-\-no\-globals\|] [\|\-\-include=\fIfile\fP\|] +[\|\-\-no\-globals\|] [\|\-\-no\-line\-directive\|] [\|\-\-include=\fIfile\fP\|] [\|\-\-ignore\-indentation\|] [\|\-\-language=\fIlanguage\fP\|] [\|\-\-members\|] [\|\-\-no\-members\|] [\|\-\-output=\fItagfile\fP\|] [\|\-\-class\-qualify\|] @@ -31,8 +31,8 @@ etags, ctags \- generate tag file for Emacs, vi [\|\-\-parse\-stdin=\fIfile\fP\|] .br [\|\-\-append\|] [\|\-\-backward\-search\|] -[\|\-\-cxref\|] [\|\-\-no\-defines\|] -[\|\-\-globals\|] [\|\-\-no\-globals\|] [\|\-\-ignore\-indentation\|] +[\|\-\-cxref\|] [\|\-\-no\-defines\|] [\|\-\-globals\|] +[\|\-\-no\-globals\|] [\|\-\-no\-line\-directive\|] [\|\-\-ignore\-indentation\|] [\|\-\-language=\fIlanguage\fP\|] [\|\-\-members\|] [\|\-\-no\-members\|] [\|\-\-class\-qualify\|] [\|\-\-output=\fItagfile\fP\|] [\|\-\-regex=\fIregexp\fP\|] @@ -105,6 +105,12 @@ the default in C and derived languages. Do not tag global variables in C and derived languages. Typically this reduces the file size by one fourth. .TP +.B \-\-no\-line\-directive +Ignore \fB#line\fP preprocessor directives in C and derived languages. The +default is to honor those directives, and record the tags as if the +file scanned was the one named in the \fB#line\fP directive. This switch is +useful when the original file named by \fB#line\fP is no longer available. +.TP \fB\-i\fP \fIfile\fP, \fB\-\-include=\fIfile\fP Include a note in the tag file indicating that, when searching for a tag, one should also consult the tags file \fIfile\fP after checking the diff --git a/lib-src/etags.c b/lib-src/etags.c index 2192627c7e0..54ed1b428e9 100644 --- a/lib-src/etags.c +++ b/lib-src/etags.c @@ -951,8 +951,7 @@ Relative ones are stored relative to the output file's directory.\n"); Do not create tag entries for global variables in some\n\ languages. This makes the tags file smaller."); - if (PRINT_UNDOCUMENTED_OPTIONS_HELP) - puts ("--no-line-directive\n\ + puts ("--no-line-directive\n\ Ignore #line preprocessor directives in C and derived languages."); if (CTAGS) -- 2.39.5