From 65993f6ed6c77b83904d0db3ac4601cbd86435be Mon Sep 17 00:00:00 2001
From: Alexander Konovalov <alexk@mcs.st-andrews.ac.uk>
Date: Sat, 13 Apr 2019 19:37:10 +0100
Subject: [PATCH] Remove RXVT shell support

Closes #3339.
---
 INSTALL.md                       | 15 +++++++--------
 cnf/cygwin/gaprxvt.bat.in        |  9 ---------
 cnf/cygwin/instcygwinterminfo.sh | 10 ----------
 configure.ac                     |  1 -
 doc/ref/copyright.xml            |  4 ++--
 5 files changed, 9 insertions(+), 30 deletions(-)
 delete mode 100644 cnf/cygwin/gaprxvt.bat.in

diff --git a/INSTALL.md b/INSTALL.md
index 2b091f6b51..46495fdb92 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -320,8 +320,8 @@ Intel Core 2 Duo / 2.53 GHz machine, and produces an output similar to the
 
 Windows users should note that the Command Prompt user interface provided
 by Microsoft might not offer history scrolling or cut and paste with the
-mouse. To get a better environment, use scripts `gap.bat` or `gaprxvt.bat`
-to start GAP instead of `gapcmd.bat`.
+mouse. To get a better environment, use the script `gap.bat` to start GAP
+instead of `gapcmd.bat`.
 
 
 7 Packages
@@ -504,15 +504,15 @@ fix is known. (One can type POW(a,b) for a^b.)
 
 ### Cut and Paste does not work
 
-You might want to try different shells, starting each of the three .bat
-files in the `bin` directory: `gap.bat`. `gaprxvt.bat` and `gapcmd.bat`.
-Also, <https://www.gap-system.org/Faq/faq.html#4> might give a remedy.
+You might want to try different shells, using both of the two `.bat`
+files in the `bin` directory: `gap.bat` and `gapcmd.bat`. Also,
+<https://www.gap-system.org/Faq/faq.html#4> might give a remedy.
 
 ### GAP does not work in the remote desktop
 
 GAP can not be started in the Windows Command Prompt shell (via `gapcmd.bat`)
-in the remote desktop. To start GAP in the remote desktop, use scripts
-`gap.bat` or `gaprxvt.bat` which should work in such setting.
+in the remote desktop. To start GAP in the remote desktop, use the script
+`gap.bat` which should work in such setting.
 
 ### You get an error message about the `cygwin1.dll`
 
@@ -662,7 +662,6 @@ in a wrong place or in a separate directory.
 After extraction you can start GAP with one of the following files:
 
     C:\gap-4.X.Y\bin\gap.bat       (recommended)
-    C:\gap-4.X.Y\bin\gaprxvt.bat
     C:\gap-4.X.Y\bin\gapcmd.bat
 
 The `gap.bat` file will start GAP in the `mintty` shell. It allows for
diff --git a/cnf/cygwin/gaprxvt.bat.in b/cnf/cygwin/gaprxvt.bat.in
deleted file mode 100644
index dec5d8b55c..0000000000
--- a/cnf/cygwin/gaprxvt.bat.in
+++ /dev/null
@@ -1,9 +0,0 @@
-set TERMINFO=@gapdir@/terminfo
-set CYGWIN=nodosfilewarning
-set LANG=en_US.ISO-8859-1
-set HOME=%HOMEDRIVE%%HOMEPATH%
-set PATH=@wincygbin@;%PATH%
-cd %HOME%
-start "GAP" @wincygbin@\rxvt.exe -fn fixedsys -sl 1000 -e @gapdir@/gap.exe -l @gapdir@ %*
-if NOT ["%errorlevel%"]==["0"] timeout 15
-exit
diff --git a/cnf/cygwin/instcygwinterminfo.sh b/cnf/cygwin/instcygwinterminfo.sh
index 97f32e542f..1c404c14cd 100755
--- a/cnf/cygwin/instcygwinterminfo.sh
+++ b/cnf/cygwin/instcygwinterminfo.sh
@@ -18,16 +18,6 @@ else
   echo "No terminfo entry for cygwin found!"
   exit 1
 fi
-if test -r $SOURCE/r/rxvt ; then
-  cp $SOURCE/r/rxvt terminfo/r
-  cp $SOURCE/r/rxvt terminfo/72
-elif test -r $SOURCE/72/rxvt ; then
-  cp $SOURCE/72/rxvt terminfo/r
-  cp $SOURCE/72/rxvt terminfo/72
-else
-  echo "No terminfo entry for rxvt found!"
-  exit 1
-fi
 if test -r $SOURCE/x/xterm ; then
   cp $SOURCE/x/xterm terminfo/x
   cp $SOURCE/x/xterm terminfo/78
diff --git a/configure.ac b/configure.ac
index 440b7845b9..74d1f5c9ce 100644
--- a/configure.ac
+++ b/configure.ac
@@ -640,7 +640,6 @@ case "$host_os" in
 
         AC_CONFIG_FILES([bin/gap.bat:cnf/cygwin/gap.bat.in], [chmod +x bin/gap.bat])
         AC_CONFIG_FILES([bin/gapcmd.bat:cnf/cygwin/gapcmd.bat.in], [chmod +x bin/gapcmd.bat])
-        AC_CONFIG_FILES([bin/gaprxvt.bat:cnf/cygwin/gaprxvt.bat.in], [chmod +x bin/gaprxvt.bat])
     ])
     ;;
   *darwin*)
diff --git a/doc/ref/copyright.xml b/doc/ref/copyright.xml
index 6443cfce37..12ab96ea96 100644
--- a/doc/ref/copyright.xml
+++ b/doc/ref/copyright.xml
@@ -83,8 +83,8 @@ executable falls under the GPL too, which it does anyhow.
 <P/>
 The <F>cyggcc_s-1.dll</F>, <F>cygncurses-10.dll</F>, <F>cygncursesw-10.dll</F>,
 <F>cygpanel-10.dll</F>, <F>cygpopt-0.dll</F>, <F>cygreadline7.dll</F>,
-<F>cygstart.exe</F>, <F>cygwin1.dll</F>, <F>libW11.dll</F>, <F>mintty.exe</F>, 
-<F>rxvt.exe</F> and <F>regtool.exe</F> are taken unmodified from the 
+<F>cygstart.exe</F>, <F>cygwin1.dll</F>, <F>libW11.dll</F>, <F>mintty.exe</F> 
+and <F>regtool.exe</F> are taken unmodified from the 
 <Package>Cygwin</Package> distribution. They are copyright by RedHat Software
 and released under the GPL. For more information on <Package>Cygwin</Package>,
 see <URL>http://www.cygwin.com</URL>.