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.

diff --git a/info/announce.t b/info/announce.t
index 94ca690f09f560886605c3950f04d0f6ab3c83df..b89014b0b9e4e2df8b7ca312ac93dc574c5409ec 100644 (file)
--- 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 3b862be227c46cbfda075c57472319fa6baff824..759db9efc38f9256b24e88a30055f4245bae40df 100644 (file)
--- 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 ea873f9d69855b6c8af51f9c97882e6b59a7c38c..63badb0ade6b28d4604fb80d3681778b83b53cde 100644 (file)
--- 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 a74c5201b6ac294a9481811238864031fb026522..6d6b292d0564c6b2f7b9c52b13f12e567a4757c9 100644 (file)
--- 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 2e03c7ebf9385f9f4b001b8289606f3a06404893..2468061cfb3e177331438e32ea8f07160b73851c 100644 (file)
--- 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 0c3b24ffd1bf5e85d62e6898513fec89bfd6172a..93dc93d0f1c2f8e3419e600bfa72e968920cf36d 100644 (file)
--- 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 (;;) {