summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBenjamin Pierce <bcpierce00@users.noreply.github.com>2018-01-29 06:34:32 -0500
committerGitHub <noreply@github.com>2018-01-29 06:34:32 -0500
commitfdbba432a8fd1e648268fbd242eed355ade09938 (patch)
tree0d64aef56acdc0ba6eb597f6d8fe24c933991517 /src
parent8a80270ad7b83c307f3b0a284ed81b62f28a4ab9 (diff)
parentafd8ae0e18e2bb52a6b7df65329b2b9d92dac695 (diff)
downloadunison-fdbba432a8fd1e648268fbd242eed355ade09938.zip
unison-fdbba432a8fd1e648268fbd242eed355ade09938.tar.gz
unison-fdbba432a8fd1e648268fbd242eed355ade09938.tar.bz2
Merge pull request #142 from g-raud/dumbtty-fix-newline
Uitext.interact: fix usage of newLine for 'dumbtty' mode
Diffstat (limited to 'src')
-rw-r--r--src/uitext.ml8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/uitext.ml b/src/uitext.ml
index fdd2568..0b50628 100644
--- a/src/uitext.ml
+++ b/src/uitext.ml
@@ -124,6 +124,8 @@ let getInput () =
c
let newLine () =
+ (* If in dumb mode (i.e. not in cbreak mode) the newline is entered by the
+ user to validate the input *)
if !cbreakMode <> None then display "\n"
let overwrite () =
@@ -348,10 +350,10 @@ let interact prilist rilist =
repeat()));
(["x"],
("show details"),
- (fun () -> display "\n"; displayDetails ri; repeat()));
+ (fun () -> newLine(); displayDetails ri; repeat()));
(["L"],
("list all suggested changes tersely"),
- (fun () -> display "\n";
+ (fun () -> newLine();
Safelist.iter
(fun ri -> displayri ri; display "\n ")
ril;
@@ -359,7 +361,7 @@ let interact prilist rilist =
repeat()));
(["l"],
("list all suggested changes with details"),
- (fun () -> display "\n";
+ (fun () -> newLine();
Safelist.iter
(fun ri -> displayri ri; display "\n ";
alwaysDisplayDetails ri)