Merge pull request #4327 from masatake/main-misc

main,doc: minor fixes

Author: masatake

docs/man/ctags.1.rst

@@ -470,9 +470,10 @@ Language Selection and Mapping Options
 	feature list; otherwise, the file name patterns are matched against
 	file names using a simple textual comparison.
 
-	When mapping a file extension with ``--langmap`` option,
-	it will first be unmapped from any other languages. (``--map-<LANG>``
-	option provides more fine-grained control.)
+	When mapping a file extension or a file name pattern with
+	``--langmap`` option, it will first be unmapped from any other
+	languages. (``--map-<LANG>`` option provides more fine-grained
+	control.)
 
 	If the first character in a *<map>* is a plus sign ('``+``'), then the extensions and
 	file name patterns in that map will be appended to the current map
@@ -1059,6 +1060,8 @@ Listing Options
 		``TAG_OUTPUT_VERSION`` in :ref:`ctags-client-tools(7) <ctags-client-tools(7)>` about the ctags output
 		version.
 
+		(since verison 6.3.0)
+
 	DESCRIPTION
 		Human readable description for the extra.
 
@@ -1112,6 +1115,8 @@ Listing Options
 		``TAG_OUTPUT_VERSION`` in :ref:`ctags-client-tools(7) <ctags-client-tools(7)>` about the ctags output
 		version.
 
+		(since verison 6.3.0)
+
 	DESCRIPTION
 		Human readable description for the field.
 
@@ -1208,6 +1213,8 @@ Listing Options
 	VER
 		The parser version introducing the kind.
 
+		(since verison 6.3.0)
+
 	DESCRIPTION
 		Human readable description for the kind.
 
@@ -1300,6 +1307,8 @@ Listing Options
 	VER
 		The parser version introducing the role.
 
+		(since verison 6.3.0)
+
 	DESCRIPTION
 		Human readable description for the role.
 
@@ -1325,6 +1334,8 @@ Miscellaneous Options
 ``--describe-language=<language>``
 	Prints the various aspects of the parser implementing the language.
 
+	(since verison 6.3.0)
+
 ``--help``
 	Prints to standard output a detailed usage description, and then exits.
 

docs/news/HEAD.rst

@@ -13,7 +13,7 @@ New option: ``--describe-language=<language>``
 
     Prints the various aspects of the parser implementing the language.
 
-New column, VER in the output of --list-{kinds-full,roles,fields,extras,pseudo-tags} options
+New column, VER in the output of ``--list-{kinds-full,roles,fields,extras,pseudo-tags}`` options
 
     Indicates the versions of ctags output (or the parser) introducing the
     item in the list.

main/fmt.c

@@ -147,7 +147,7 @@ static fmtElement** queueLiteral (fmtElement **last, char *literal)
    Here the two parts are combined with `.'.
 
    If it cannot find a period, it returns LANG_IGNORE and sets
-   fullname to *fieldName.
+   fullName to *fieldName.
 
    If lang part if `*', it returns LANG_AUTO and sets the field
    name part to *fieldName.

main/main.c

@@ -604,6 +604,5 @@ extern int ctags_cli_main (int argc CTAGS_ATTR_UNUSED, char **argv)
 	if (Option.printLanguage)
 		return (Option.printLanguage == true)? 0: 1;
 
-	exit (0);
 	return 0;
 }

man/ctags.1.rst.in

@@ -470,9 +470,10 @@ Language Selection and Mapping Options
 	feature list; otherwise, the file name patterns are matched against
 	file names using a simple textual comparison.
 
-	When mapping a file extension with ``--langmap`` option,
-	it will first be unmapped from any other languages. (``--map-<LANG>``
-	option provides more fine-grained control.)
+	When mapping a file extension or a file name pattern with
+	``--langmap`` option, it will first be unmapped from any other
+	languages. (``--map-<LANG>`` option provides more fine-grained
+	control.)
 
 	If the first character in a *<map>* is a plus sign ('``+``'), then the extensions and
 	file name patterns in that map will be appended to the current map
@@ -1059,6 +1060,8 @@ Listing Options
 		``TAG_OUTPUT_VERSION`` in ctags-client-tools(7) about the ctags output
 		version.
 
+		(since verison 6.3.0)
+
 	DESCRIPTION
 		Human readable description for the extra.
 
@@ -1112,6 +1115,8 @@ Listing Options
 		``TAG_OUTPUT_VERSION`` in ctags-client-tools(7) about the ctags output
 		version.
 
+		(since verison 6.3.0)
+
 	DESCRIPTION
 		Human readable description for the field.
 
@@ -1208,6 +1213,8 @@ Listing Options
 	VER
 		The parser version introducing the kind.
 
+		(since verison 6.3.0)
+
 	DESCRIPTION
 		Human readable description for the kind.
 
@@ -1300,6 +1307,8 @@ Listing Options
 	VER
 		The parser version introducing the role.
 
+		(since verison 6.3.0)
+
 	DESCRIPTION
 		Human readable description for the role.
 
@@ -1325,6 +1334,8 @@ Miscellaneous Options
 ``--describe-language=<language>``
 	Prints the various aspects of the parser implementing the language.
 
+	(since verison 6.3.0)
+
 ``--help``
 	Prints to standard output a detailed usage description, and then exits.