[SCM] GNU Inetutils branch, master, updated. v2.0-12-gef2060d

[Simon Josefsson]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Inetutils ".

The branch, master has been updated
       via  ef2060d53581649f6347574b21ecbbdcc0067b8a (commit)
      from  c2e4ed31efb8c94116f873f87969eb2deef5b338 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=ef2060d53581649f6347574b21ecbbdcc0067b8a


commit ef2060d53581649f6347574b21ecbbdcc0067b8a
Author: Simon Josefsson <simon@josefsson.org>
Date:   Wed May 26 15:23:20 2021 +0200

    ftp: Fix usage under Emacs AngeFTP on Mac OS.
    
    * NEWS: Doc fix.
    * doc/inetutils.texi (ftp invocation): Improve --no-edit.
    * ftp/main.c (main): Disable readline when TERM unset or dumb,
    inspired by trivial patch from Alex Bochannek <alex@bochannek.com>.

diff --git a/.gitignore b/.gitignore
index 0e3bdf4..fc5cf54 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,6 +41,7 @@
 /stamp-h.in
 /stamp-h1
 /summary.sh
+ChangeLog
 Makefile
 Makefile.in
 TAGS
diff --git a/NEWS b/NEWS
index 42d87a6..8c48c73 100644
--- a/NEWS
+++ b/NEWS
@@ -2,18 +2,24 @@ GNU inetutils NEWS -- history of user-visible changes.
 
 * Noteworthy changes in release ?.? (????-??-??) [?]
 
-* ChangeLog is now automatically generated from version controlled logs.
+** ChangeLog is now automatically generated from version controlled logs.
 
 Historical information is preserved as ChangeLog.0 and ChangeLog.1.
 
-* telnet
+** ftp
+
+Disable use of readline when environment variable TERM is unset or set
+to "dumb" (caused problems with Emacs AngeFTP on MacOS).  Thanks to
+Alex Bochannek for report, debugging and patch.
+
+** telnet
 
 ** Implement --bind (-b).
 
 This is used to bind to a particular local socket, for compatibility
 with NetKit's telnet.
 
-* whois
+** whois
 
 Updated whois servers for .ORG and .IN.
 
diff --git a/doc/inetutils.texi b/doc/inetutils.texi
index ba7c9d2..1d6df30 100644
--- a/doc/inetutils.texi
+++ b/doc/inetutils.texi
@@ -1594,8 +1594,9 @@ Enable debugging output and possibly also socket 
debugging.
 @itemx --no-edit
 @opindex -e
 @opindex --no-edit
-Disables the editing of commands.  This is default setting
-for batch mode, without a TTY.
+Disables the editing of commands.  This is default setting for batch
+mode, without a TTY, or when the environment variable @env{TERM} is not
+set or its value is @samp{dumb}.
 
 @item -g
 @itemx --no-glob
diff --git a/ftp/main.c b/ftp/main.c
index 1edffd4..b6b6c27 100644
--- a/ftp/main.c
+++ b/ftp/main.c
@@ -259,6 +259,10 @@ main (int argc, char *argv[])
       verbose++;
       if (!prompt)
        prompt = DEFAULT_PROMPT;
+
+      cp = getenv ("TERM");
+      if (cp == NULL || strcmp (cp, "dumb") == 0)
+       usereadline = 0;
     }
   else
     usereadline = 0;

-----------------------------------------------------------------------

Summary of changes:
 .gitignore         |  1 +
 NEWS               | 12 +++++++++---
 doc/inetutils.texi |  5 +++--
 ftp/main.c         |  4 ++++
 4 files changed, 17 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
GNU Inetutils