From 5dcd748f9db900bb6699ea3c9304deb575841860 Mon Sep 17 00:00:00 2001
From: Markus Armbruster <armbru@pond.sub.org>
Date: Sun, 22 Mar 2009 09:52:06 +0100
Subject: [PATCH] Don't advertize ^D as means to end a telegram

getele() aborts the telegram on EOF since commit bc8a4432 (v4.2.21).
Besides, ^D may not work with some clients.
---
 info/announce.t       | 2 +-
 info/flash.t          | 4 ++--
 info/pray.t           | 3 ++-
 info/telegram.t       | 6 +++---
 info/wall.t           | 4 ++--
 src/lib/subs/getele.c | 2 +-
 6 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/info/announce.t b/info/announce.t
index 94ca690f..b89014b0 100644
--- a/info/announce.t
+++ b/info/announce.t
@@ -11,7 +11,7 @@ For example:
 .EX announce
 .NF
 Enter telegram for everybody
-undo last line with ~u, print with ~p, abort with ~q, end with ^D or .
+undo last line with ~u, print with ~p, abort with ~q, end with .
 1024 left: 
 1023 left:               For Immediate Release
  987 left:                     from
diff --git a/info/flash.t b/info/flash.t
index 3b862be2..759db9ef 100644
--- a/info/flash.t
+++ b/info/flash.t
@@ -18,8 +18,8 @@ Or you can send a multi-line message:
 > I ate Fodderland for lunch.
 > .
 .FI
-Note that you can end a multi-line flash with either a '.' (period)
-on a line all by itself, or by hitting ^D on a line by itself.
+You can end a multi-line flash with a '.' (period) on a line all by
+itself.
 .s1
 If you do not wish to receive any flash messages from your friends,
 then you can temporarily turn the feature off by typing "toggle flash".
diff --git a/info/pray.t b/info/pray.t
index ea873f9d..63badb0a 100644
--- a/info/pray.t
+++ b/info/pray.t
@@ -21,7 +21,8 @@ is the telegram; if you should be in need of aid type:
 When the program requests your message for The Deity,
 state it simply:
 .NF
-Enter telegram for your Gracious Deity; end with ^D
+Enter telegram for your Gracious Deity
+undo last line with ~u, print with ~p, abort with ~q, end with .
 <512> I can't do anything!!!!
 <488> HELP!!
 <481> .
diff --git a/info/telegram.t b/info/telegram.t
index a74c5201..6d6b292d 100644
--- a/info/telegram.t
+++ b/info/telegram.t
@@ -13,15 +13,15 @@ Telegrams sent to country #0 appear as prayers,
 (favors are best obtained in this manner.)
 .s1
 While entering your telegram the system tells you how many characters
-you have left.  You end the telegram by typing ^D on a line by itself,
-or by entering a line with a '.' on a line by itself. A line containing
+you have left.  You end the telegram by by entering a line with a '.'
+on a line by itself. A line containing
 only '~q' will abort the telegram.
 .s1
 For example:
 .EX tel 7 8
 .NF
 Enter telegram for multiple recipients
-undo last line with ~u, print with ~p, abort with ~q, end with ^D or .
+undo last line with ~u, print with ~p, abort with ~q, end with .
  1024 left:
  1023 left: B.F.D. Pouncetrifle
  1003 left: Groonland Embassy
diff --git a/info/wall.t b/info/wall.t
index 2e03c7eb..2468061c 100644
--- a/info/wall.t
+++ b/info/wall.t
@@ -15,8 +15,8 @@ Or you can send a multi-line message:
 > OK, let's hit the beaches!
 > .
 .FI
-Note that you can end a multi-line wall with either a '.' (period)
-on a line all by itself, or by hitting ^D on a line by itself.
+You can end a multi-line flash with a '.' (period) on a line all by
+itself.
 .s1
 If you do not wish to receive any broadcast messages from your allies,
 then you can temporarily turn the feature off by typing "toggle flash".
diff --git a/src/lib/subs/getele.c b/src/lib/subs/getele.c
index 0c3b24ff..93dc93d0 100644
--- a/src/lib/subs/getele.c
+++ b/src/lib/subs/getele.c
@@ -53,7 +53,7 @@ getele(char *recipient, char *buf)
     char left[16];
 
     pr("Enter telegram for %s\n", recipient);
-    pr("undo last line with ~u, print with ~p, abort with ~q, end with ^D or .\n");
+    pr("undo last line with ~u, print with ~p, abort with ~q, end with .\n");
     bp = buf;
     *bp = 0;
     for (;;) {