Merge branch '4.03_merged_in_trunk' of https://github.com/bobot/ocaml into bobot-4.03_merged_in_trunk

3 files changed, 22 insertions, 3 deletions

diff --git a/manual/manual/cmds/comp.etex b/manual/manual/cmds/comp.etex
index a7aabd2957..0e3fc1fd87 100644
--- a/manual/manual/cmds/comp.etex
+++ b/manual/manual/cmds/comp.etex
@@ -162,6 +162,19 @@ Pass the given option to the C compiler and linker. When linking in
 "-ccopt -L"\var{dir} causes the C linker to search for C libraries in
 directory \var{dir}.   (See the "-custom" option.)
 
+\item["-color" \var{mode}]
+Enable or disable colors in compiler messages (especially warnings and errors).
+The following modes are supported:
+\begin{description}
+  \item["auto"] use heuristics to enable colors only if the output supports them (an ANSI-compatible tty terminal);
+  \item["always"] enable colors unconditionally;
+  \item["never"] disable color output.
+\end{description}
+The default setting is 'auto', and the current heuristic
+checks that the "TERM" environment variable exists and is
+not empty or "dumb", and that \verb!isatty(stderr)! holds.
+
+
 \item["-compat-32"]
 Check that the generated bytecode executable can run on 32-bit
 platforms and signal an error if it cannot. This is useful when
@@ -392,7 +405,9 @@ a future version of OCaml.
 \item["-short-paths"]
 When a type is visible under several module-paths, use the shortest
 one when printing the type's name in inferred interfaces and error and
-warning messages.
+warning messages. Identifier names starting with an underscore "_" or
+containing double underscores "__" incur a penalty of $+10$ when computing
+their length.
 
 \item["-strict-sequence"]
 Force the left-hand part of each sequence to have type unit.
diff --git a/manual/manual/cmds/native.etex b/manual/manual/cmds/native.etex
index 33b2399c65..f20a43dcdd 100644
--- a/manual/manual/cmds/native.etex
+++ b/manual/manual/cmds/native.etex
@@ -384,7 +384,9 @@ a future version of OCaml.
 \item["-short-paths"]
 When a type is visible under several module-paths, use the shortest
 one when printing the type's name in inferred interfaces and error and
-warning messages.
+warning messages. Identifier names starting with an underscore "_" or
+containing double underscores "__" incur a penalty of $+10$ when computing
+their length.
 
 \item["-strict-sequence"]
 Force the left-hand part of each sequence to have type unit.
diff --git a/manual/manual/cmds/top.etex b/manual/manual/cmds/top.etex
index 4d1ae5cde7..6dfba25023 100644
--- a/manual/manual/cmds/top.etex
+++ b/manual/manual/cmds/top.etex
@@ -211,7 +211,9 @@ a future version of OCaml.
 \item["-short-paths"]
 When a type is visible under several module-paths, use the shortest
 one when printing the type's name in inferred interfaces and error and
-warning messages.
+warning messages. Identifier names starting with an underscore "_" or
+containing double underscores "__" incur a penalty of $+10$ when computing
+their length.
 
 \item["-stdin"]
 Read the standard input as a script file rather than starting an