From: Eric S. Raymond <esr@thyrsus.com>
Date: Fri, 20 Sep 2024 14:29:37 +0000 (-0400)
Subject: Make oldstyle correctly suppress line editing.
X-Git-Tag: 1.20~17
X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=3d6c689ffa6ab95e2b59c0fc284038a41f7f598e;p=open-adventure.git

Make oldstyle correctly suppress line editing.
---

diff --git a/NEWS.adoc b/NEWS.adoc
index 2d0dcee..f9c70d6 100644
--- a/NEWS.adoc
+++ b/NEWS.adoc
@@ -2,6 +2,9 @@
 // SPDX-FileCopyrightText: (C) Eric S. Raymond <esr@thyrsus.com>
 // SPDX-License-Identifier: CC-BY-4.0
 
+Repository head::
+  Make oldstyle correctly suppress line editing.
+
 1.19: 2024-06-27::
   Ensore that the KNIVES_VANISH message can't issue twice.
 
diff --git a/main.c b/main.c
index 2dfa880..e0e4c58 100644
--- a/main.c
+++ b/main.c
@@ -81,7 +81,7 @@ char *myreadline(const char *prompt) {
 			}
 		}
 
-		if (isatty(fileno(settings.scriptfp))) {
+		if (isatty(fileno(settings.scriptfp)) && !settings.oldstyle) {
 			free(buf);               // LCOV_EXCL_LINE
 			return readline(prompt); // LCOV_EXCL_LINE
 		} else {