From c8580d1fb6f7f4c5dc579c43a5951835de0ec08e Mon Sep 17 00:00:00 2001
From: John Hood <cgull@glup.org>
Date: Wed, 2 Aug 2017 21:29:20 -0400
Subject: [PATCH] Rename and document --predict-overwrite.

---
 man/mosh-client.1 |  5 +++++
 man/mosh.1        | 12 ++++++++++++
 scripts/mosh.pl   |  4 ++--
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/man/mosh-client.1 b/man/mosh-client.1
index e871892..ee5bba5 100644
--- a/man/mosh-client.1
+++ b/man/mosh-client.1
@@ -72,6 +72,11 @@ See
 Controls local echo as described in
 .BR mosh (1).
 
+.TP
+.B MOSH_PREDICTION_OVERWRITE
+Controls local echo insert/overwrite as described in
+.BR mosh (1).
+
 .TP
 .B MOSH_TITLE_NOPREFIX
 See
diff --git a/man/mosh.1 b/man/mosh.1
index a71c100..a77a8d3 100644
--- a/man/mosh.1
+++ b/man/mosh.1
@@ -142,6 +142,18 @@ Synonym for \-\-predict=always
 .B \-n
 Synonym for \-\-predict=never
 
+.TP
+.B \-\-predict\-overwrite\fP
+When prediction is enabled, do not insert speculative local echo
+before existing text, but overwrite it instead.
+
+The MOSH_PREDICTION_OVERWRITE environment variable also enables this
+if its value is 'yes'.
+
+.TP
+.B \-o
+Synonym for \-\-predict\-overwrite
+
 .TP
 .B \-\-family=inet
 Only use IPv4 for the SSH connection and Mosh session.
diff --git a/scripts/mosh.pl b/scripts/mosh.pl
index 044994d..ab682a9 100755
--- a/scripts/mosh.pl
+++ b/scripts/mosh.pl
@@ -99,7 +99,7 @@ qq{Usage: $0 [options] [--] [user@]host [command...]
 -n      --predict=never         never use local echo
         --predict=experimental  aggressively echo even when incorrect
 
--o      --overwrite             prediction overwrites instead of inserting
+-o      --predict-overwrite     prediction overwrites instead of inserting
 
 -4      --family=inet        use IPv4 only
 -6      --family=inet6       use IPv6 only
@@ -154,7 +154,7 @@ sub predict_check {
 GetOptions( 'client=s' => \$client,
 	    'server=s' => \$server,
 	    'predict=s' => \$predict,
-	    'overwrite|o!' => \$overwrite,
+	    'predict-overwrite|o!' => \$overwrite,
 	    'port=s' => \$port_request,
 	    'a' => sub { $predict = 'always' },
 	    'n' => sub { $predict = 'never' },