diff --git a/merry.opam b/merry.opam index 1031e72..9343cd7 100644 --- a/merry.opam +++ b/merry.opam @@ -55,7 +55,7 @@ dev-repo: "git+https://tangled.org/patrick.sirref.org/merry" x-maintenance-intent: ["(latest)"] pin-depends:[ [ "eio_mem.dev" "git+https://git.sirref.org/eio_mem#3e7d5dd3de6d221b4b1bd694a119f10ea4d62184" ] - [ "bruit.dev" "git+https://git.sirref.org/bruit#bdeb36c50c583724ea50792c6125d6c1389eff0f" ] + [ "bruit.dev" "git+https://git.sirref.org/bruit#75b64b7dfad9ce659d91128fb49773dfa78926ee" ] [ "glob.dev" "git+https://git.sirref.org/glob#c1856d8bcc69a7b2d0e567dd3e7b4f0318db3f03" ] [ "eio_brr.dev" "git+https://github.com/ocaml-multicore/eio_js#f8a49b800783ddf56c0046410c36557ff3df3386" ] [ "eio_js_backend.dev" "git+https://github.com/ocaml-multicore/eio_js#f8a49b800783ddf56c0046410c36557ff3df3386" ] diff --git a/merry.opam.template b/merry.opam.template index 9583ce5..0d3f784 100644 --- a/merry.opam.template +++ b/merry.opam.template @@ -1,6 +1,6 @@ pin-depends:[ [ "eio_mem.dev" "git+https://git.sirref.org/eio_mem#3e7d5dd3de6d221b4b1bd694a119f10ea4d62184" ] - [ "bruit.dev" "git+https://git.sirref.org/bruit#bdeb36c50c583724ea50792c6125d6c1389eff0f" ] + [ "bruit.dev" "git+https://git.sirref.org/bruit#75b64b7dfad9ce659d91128fb49773dfa78926ee" ] [ "glob.dev" "git+https://git.sirref.org/glob#c1856d8bcc69a7b2d0e567dd3e7b4f0318db3f03" ] [ "eio_brr.dev" "git+https://github.com/ocaml-multicore/eio_js#f8a49b800783ddf56c0046410c36557ff3df3386" ] [ "eio_js_backend.dev" "git+https://github.com/ocaml-multicore/eio_js#f8a49b800783ddf56c0046410c36557ff3df3386" ] diff --git a/src/bin/main.ml b/src/bin/main.ml index 44834ca..9d277fc 100644 --- a/src/bin/main.ml +++ b/src/bin/main.ml @@ -57,7 +57,7 @@ let sh ~name:_ shell env = executor fd_table ~fd_opt:Merry_posix.fd_opt ~async_switch ~options:shell.options ~argv ~program:pos_zero env in - let bruit_ctx = Bruit_unix.stdctx () in + let bruit_ctx ~hint = Bruit_unix.stdctx ~hint () in match (shell.arguments, shell.command) with | [], false -> let argv = Array.of_list (pos_zero :: shell.arguments) in diff --git a/src/browser/index.ml b/src/browser/index.ml index 6ed07c7..663ff7d 100644 --- a/src/browser/index.ml +++ b/src/browser/index.ml @@ -264,7 +264,7 @@ let () = handle_systhreads ~thread_pool @@ fun () -> El.append_children (Document.head G.document) [ El.style [ El.txt' Ansi.css ] ]; - let bruit_ctx = Bruit_brr.stdctx ~redirect:true stdin prompt stdout in + let bruit_ctx ~hint:_ = Bruit_brr.stdctx ~redirect:true stdin prompt stdout in let path = match Sys.getenv_opt "PATH" with | Some v -> Option.some @@ String.split_on_char ':' v diff --git a/src/lib/interactive.ml b/src/lib/interactive.ml index fea9265..062405a 100644 --- a/src/lib/interactive.ml +++ b/src/lib/interactive.ml @@ -139,7 +139,7 @@ struct complete ctx ~home:"/" in match - Bruit.bruit bruit_ctx ~hint + Bruit.bruit (bruit_ctx ~hint) ~history:(fun command -> H.history ~command !h |> H.commands) ~complete "% " with