Merge branch 'v8.6'

2 files changed, 2 insertions, 2 deletions

diff --git a/lib/cWarnings.ml b/lib/cWarnings.ml
index 7b8dc2b9b5..78fa84f333 100644
--- a/lib/cWarnings.ml
+++ b/lib/cWarnings.ml
@@ -48,7 +48,7 @@ let create ~name ~category ?(default=Enabled) pp =
               CErrors.user_err_loc (loc,"_",pp x)
            | Enabled ->
               let msg =
-                pp x ++ str " [" ++ str name ++ str "," ++
+                pp x ++ spc () ++ str "[" ++ str name ++ str "," ++
                   str category ++ str "]"
               in
               let loc = Option.default !current_loc loc in
diff --git a/lib/pp.ml b/lib/pp.ml
index f1eb4c0598..7f4bc149dc 100644
--- a/lib/pp.ml
+++ b/lib/pp.ml
@@ -204,7 +204,7 @@ let pr_loc_pos loc =
     int (fst loc) ++ str"-" ++ int (snd loc)
 
 let pr_loc loc =
-  if Loc.is_ghost loc then str"<unknown>"
+  if Loc.is_ghost loc then str"<unknown>" ++ fnl ()
   else
     let fname = loc.Loc.fname in
     if CString.equal fname "" then