summaryrefslogtreecommitdiffabout
diff options
context:
space:
mode:
authorArmaël Guéneau <armael.gueneau@ens-lyon.org>2020-01-27 22:35:13 (CET)
committer Armaël Guéneau <armael.gueneau@ens-lyon.org>2020-01-27 22:35:13 (CET)
commit52441991959d83b3dc965bfafd1e981589f323d6 (patch)
tree2844877facd2a121e0c60fcf5a22d5c28229eb0d
parenta4d9d5554d946e6d1358446e7743b3b49c9fea53 (diff)
downloadpapiers-master.tar.gz
papiers-master.tar.bz2
Upgrade to lambda-term >= 2.0HEADmaster
-rw-r--r--papiers.opam2
-rw-r--r--src/prelude.ml6
2 files changed, 4 insertions, 4 deletions
diff --git a/papiers.opam b/papiers.opam
index f30ba8e..ccb3f9b 100644
--- a/papiers.opam
+++ b/papiers.opam
@@ -14,7 +14,7 @@ depends: [
"ANSITerminal"
"cmdliner"
"camlpdf"
- "lambda-term" {< "2.0"}
+ "lambda-term" {>= "2.0"}
]
homepage: "http://git.isomorphis.me/papiers/about/"
dev-repo: "git://git.isomorphis.me/papiers.git"
diff --git a/src/prelude.ml b/src/prelude.ml
index a5c336f..80bc25b 100644
--- a/src/prelude.ml
+++ b/src/prelude.ml
@@ -68,7 +68,7 @@ let in_path (name: string): bool =
class read_line ~term ~prompt = object(self)
inherit LTerm_read_line.read_line ()
- inherit [Zed_utf8.t] LTerm_read_line.term term
+ inherit [Zed_string.t] LTerm_read_line.term term
method! show_box = false
@@ -82,11 +82,11 @@ let read_line ?(prompt = "") ?(initial_text = "") () =
let open Lwt in
let main =
Lazy.force LTerm.stdout >>= fun term ->
- let engine = new read_line ~term ~prompt in
+ let engine = new read_line ~term ~prompt:(Zed_string.of_utf8 prompt) in
CamomileLibrary.UTF8.iter engine#insert initial_text;
engine#run
in
- Lwt_main.run main
+ Lwt_main.run main |> Zed_string.to_utf8
(*****************************************************************************)
(* Path manipulations : *)