Merge branch 'ocaml:main' into fix-11045-git-subfolders

Author: Richard-Degenne

CHANGES.md

@@ -5,6 +5,14 @@ If you're a contributor, please include your CHANGES entry in a file
 `doc/changes/$PR_NAME.md`. At release time, it will be incoporated into the
 changelog properly.
 
+3.18.2 (2024-04-29)
+-------------------
+
+### Fixed
+
+- fix compatibility with `ocaml.5.4.0` by avoiding shadowing sigwinch (@nojb,
+  #11639)
+
 3.18.1 (2025-04-15)
 -------------------
 

otherlibs/stdune/src/user_message.ml

@@ -289,7 +289,7 @@ let did_you_mean s ~candidates =
 
 let to_string t =
   let full_error = Format.asprintf "%a" Pp.to_fmt (pp { t with loc = None }) in
-  match String.drop_prefix ~prefix:"Error: " full_error with
+  match String.drop_prefix ~prefix:"Error:" full_error with
   | None -> full_error
   | Some error -> String.trim error
 ;;

otherlibs/stdune/src/user_message.mli

@@ -107,7 +107,7 @@ val prerr : ?config:Print_config.t -> t -> unit
 val did_you_mean : string -> candidates:string list -> Style.t Pp.t list
 
 (** Produces a plain text representation of the error message, without the
-    "Error: " prefix. *)
+    "Error:" prefix. *)
 val to_string : t -> string
 
 (** Returns [true] if the message has an explicit location or one embedded in