Merge PR #9145: Do so that an error message follows the "Error:" header on the same line

3 files changed, 3 insertions, 5 deletions

diff --git a/lib/cErrors.ml b/lib/cErrors.ml
index 811fcf4063..79f0a806a7 100644
--- a/lib/cErrors.ml
+++ b/lib/cErrors.ml
@@ -112,7 +112,7 @@ let iprint_no_report (e, info) =
 
 let _ = register_handler begin function
   | UserError(s, pps) ->
-    hov 0 (where s ++ pps)
+    where s ++ pps
   | _ -> raise Unhandled
 end
 
diff --git a/test-suite/output/ErrorInCanonicalStructures.out b/test-suite/output/ErrorInCanonicalStructures.out
index 73da4f44f8..b4aa60a2c8 100644
--- a/test-suite/output/ErrorInCanonicalStructures.out
+++ b/test-suite/output/ErrorInCanonicalStructures.out
@@ -1,5 +1,4 @@
 File "stdin", line 3, characters 0-24:
-Error:
-Could not declare a canonical structure Foo.
+Error: Could not declare a canonical structure Foo.
 Expected an instance of a record or structure.
 
diff --git a/test-suite/output/ErrorInCanonicalStructures2.out b/test-suite/output/ErrorInCanonicalStructures2.out
index 63a2871b82..ab64e25030 100644
--- a/test-suite/output/ErrorInCanonicalStructures2.out
+++ b/test-suite/output/ErrorInCanonicalStructures2.out
@@ -1,5 +1,4 @@
 File "stdin", line 3, characters 0-24:
-Error:
-Could not declare a canonical structure bar.
+Error: Could not declare a canonical structure bar.
 Expected an instance of a record or structure.