kernel: move readline specific code out of InitSystem

gap-system · Jan 5, 2025 · 8147e67 · 8147e67
1 parent 19d38eb
commit 8147e67
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 11 deletions.
diff --git a/src/sysfiles.c b/src/sysfiles.c
@@ -3234,6 +3234,16 @@ void InitSysFiles(void)
     setbuf(stderr, (char *)0);
 
 #ifdef HAVE_LIBREADLINE
+    // don't use readline if in Window mode (e.g. for XGAP)
+    if (SyWindow)
+        SyUseReadline = 0;
+
+    // don't use readline if stdin is not attached to a terminal
+    // FIXME: disabled this, as it breaks certain workspaces (see also
+    // issue https://github.com/gap-system/gap/issues/5014)
+    //else if (!isatty(fileno(stdin)))
+    //    SyUseReadline = 0;
+
     if (SyUseReadline) {
         rl_readline_name = "GAP";
         rl_initialize();

diff --git a/src/system.c b/src/system.c
@@ -661,17 +661,6 @@ void InitSystem (
 
       }
 
-#ifdef HAVE_LIBREADLINE
-    // don't use readline if in Window mode (e.g. for XGAP)
-    if (SyWindow)
-        SyUseReadline = 0;
-    // don't use readline if stdin is not attached to a terminal
-    // FIXME: disabled this, as it breaks certain workspaces (see also
-    // issue https://github.com/gap-system/gap/issues/5014)
-    //else if (!isatty(fileno(stdin)))
-    //    SyUseReadline = 0;
-#endif
-
     InitSysFiles();
 
     // now that the user has had a chance to give -x and -y,