Skip to content

Commit

Permalink
Use open_in_bin not open_in for merlinpp (ocaml#1725)
Browse files Browse the repository at this point in the history
from jonahbeckford/fix-file-open-win32
  • Loading branch information
voodoos committed Feb 20, 2024
1 parent 12d9e57 commit c1894f6
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ merlin NEXT_VERSION
- Add a query_num field to the `ocamlmerlin` responses to detect server crashes (#1716)
+ editor modes
- vim: load merlin under the ocamlinterface and ocamllex filetypes (#1340)
- Fix merlinpp not using binary file open (#1725, fixes #1724)

merlin 4.13.1
=============
Expand Down
2 changes: 1 addition & 1 deletion src/ocaml/driver/pparse.ml
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ let apply_pp ~workdir ~filename ~source ~pp =
end else if not (Sys.file_exists fn_out) then
Error (WrongMagic comm)
else
let ic = open_in fn_out in
let ic = open_in_bin fn_out in
let result = Misc.string_of_file ic in
close_in ic;
Ok result
Expand Down

0 comments on commit c1894f6

Please sign in to comment.