aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2016-01-15 10:54:03 +0200
committerEli Zaretskii2016-01-15 10:54:03 +0200
commitfee0526a189f43e8470d78e8374bd425890fbe6f (patch)
tree331c457af2cd42bf6f25b85e5b112fe97da35ef1
parentb70dba4e18514411ed38b5bbb846558158842ace (diff)
downloademacs-fee0526a189f43e8470d78e8374bd425890fbe6f.tar.gz
emacs-fee0526a189f43e8470d78e8374bd425890fbe6f.zip
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.
-rw-r--r--doc/man/etags.112
-rw-r--r--lib-src/etags.c3
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
17[\|\-\-parse\-stdin=\fIfile\fP\|] 17[\|\-\-parse\-stdin=\fIfile\fP\|]
18.br 18.br
19[\|\-\-append\|] [\|\-\-no\-defines\|] [\|\-\-globals\|] 19[\|\-\-append\|] [\|\-\-no\-defines\|] [\|\-\-globals\|]
20[\|\-\-no\-globals\|] [\|\-\-include=\fIfile\fP\|] 20[\|\-\-no\-globals\|] [\|\-\-no\-line\-directive\|] [\|\-\-include=\fIfile\fP\|]
21[\|\-\-ignore\-indentation\|] [\|\-\-language=\fIlanguage\fP\|] 21[\|\-\-ignore\-indentation\|] [\|\-\-language=\fIlanguage\fP\|]
22[\|\-\-members\|] [\|\-\-no\-members\|] [\|\-\-output=\fItagfile\fP\|] 22[\|\-\-members\|] [\|\-\-no\-members\|] [\|\-\-output=\fItagfile\fP\|]
23[\|\-\-class\-qualify\|] 23[\|\-\-class\-qualify\|]
@@ -31,8 +31,8 @@ etags, ctags \- generate tag file for Emacs, vi
31[\|\-\-parse\-stdin=\fIfile\fP\|] 31[\|\-\-parse\-stdin=\fIfile\fP\|]
32.br 32.br
33[\|\-\-append\|] [\|\-\-backward\-search\|] 33[\|\-\-append\|] [\|\-\-backward\-search\|]
34[\|\-\-cxref\|] [\|\-\-no\-defines\|] 34[\|\-\-cxref\|] [\|\-\-no\-defines\|] [\|\-\-globals\|]
35[\|\-\-globals\|] [\|\-\-no\-globals\|] [\|\-\-ignore\-indentation\|] 35[\|\-\-no\-globals\|] [\|\-\-no\-line\-directive\|] [\|\-\-ignore\-indentation\|]
36[\|\-\-language=\fIlanguage\fP\|] [\|\-\-members\|] [\|\-\-no\-members\|] 36[\|\-\-language=\fIlanguage\fP\|] [\|\-\-members\|] [\|\-\-no\-members\|]
37[\|\-\-class\-qualify\|] 37[\|\-\-class\-qualify\|]
38[\|\-\-output=\fItagfile\fP\|] [\|\-\-regex=\fIregexp\fP\|] 38[\|\-\-output=\fItagfile\fP\|] [\|\-\-regex=\fIregexp\fP\|]
@@ -105,6 +105,12 @@ the default in C and derived languages.
105Do not tag global variables in C and derived languages. Typically this 105Do not tag global variables in C and derived languages. Typically this
106reduces the file size by one fourth. 106reduces the file size by one fourth.
107.TP 107.TP
108.B \-\-no\-line\-directive
109Ignore \fB#line\fP preprocessor directives in C and derived languages. The
110default is to honor those directives, and record the tags as if the
111file scanned was the one named in the \fB#line\fP directive. This switch is
112useful when the original file named by \fB#line\fP is no longer available.
113.TP
108\fB\-i\fP \fIfile\fP, \fB\-\-include=\fIfile\fP 114\fB\-i\fP \fIfile\fP, \fB\-\-include=\fIfile\fP
109Include a note in the tag file indicating that, when searching for a 115Include a note in the tag file indicating that, when searching for a
110tag, one should also consult the tags file \fIfile\fP after checking the 116tag, 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");
951 Do not create tag entries for global variables in some\n\ 951 Do not create tag entries for global variables in some\n\
952 languages. This makes the tags file smaller."); 952 languages. This makes the tags file smaller.");
953 953
954 if (PRINT_UNDOCUMENTED_OPTIONS_HELP) 954 puts ("--no-line-directive\n\
955 puts ("--no-line-directive\n\
956 Ignore #line preprocessor directives in C and derived languages."); 955 Ignore #line preprocessor directives in C and derived languages.");
957 956
958 if (CTAGS) 957 if (CTAGS)