Imported Upstream version 3.9.5upstream/3.9.5

4 files changed, 6 insertions, 70 deletions

diff --git a/terminfo/README b/terminfo/README
index ccbf488..45b39e6 100644
--- a/terminfo/README
+++ b/terminfo/README
@@ -2,7 +2,8 @@
 This directory contains various file for termcap/terminfo installation
 and testing:
 
-screencap		Termcap entry for screen. Add to /etc/termcap.
+screencap		Termcap entry for screen. Add it to /etc/termcap.
+			On NetBSD, you should run /usr/bin/cap_mkdb afterwards.
 
 screeninfo.src		Terminfo entry. Use 'tic screeninfo.src'
 			to install (Sun: /usr/5bin/tic).
diff --git a/terminfo/sco.mail b/terminfo/sco.mail
deleted file mode 100644
index bd95e4f..0000000
--- a/terminfo/sco.mail
+++ /dev/null
@@ -1,65 +0,0 @@
-From root%mjbtn.UUCP@uunet.UU.NET Tue Oct 22 03:09:14 1991
-Received: from relay2.UU.NET by immd4.informatik.uni-erlangen.de  with SMTP (5.64+/7.3a-FAU)
-	id AA10018; Tue, 22 Oct 91 03:09:04 +0100
-Received: from uunet.uu.net (via LOCALHOST.UU.NET) by relay2.UU.NET with SMTP 
-	(5.61/UUNET-internet-primary) id AA09640; Mon, 21 Oct 91 22:09:07 -0400
-Received: from mjbtn.UUCP by uunet.uu.net with UUCP/RMAIL
-	(queueing-rmail) id 220830.17203; Mon, 21 Oct 1991 22:08:30 EDT
-Received: by mjbtn.jobsoft.com (/\==/\ Smail3.1.21.1); Mon, 21 Oct 91 20:49 CDT
-Message-Id: <m0kZBFd-0007XHC@mjbtn.jobsoft.com>
-From: root@mjbtn.jobsoft.com (Mark J. Bailey [ADMIN])
-Subject: Re: oh yes
-To: jnweiger%immd4.informatik.uni-erlangen.de%uunet.UUCP@uunet.UU.NET (Juergen Weigert)
-Date: Mon, 21 Oct 91 20:49:49 CDT
-In-Reply-To: <9110212148.AA01737@faui43.informatik.uni-erlangen.de>; from "Juergen Weigert" at Oct 21, 91 10:48 pm
-X-Mailer: ELM [version 2.3 PL11]
-Status: OR
-
-Hi,
-
-Well, more playing and finally some progress!  :-)
-
-This is my .screenrc:
-
-terminfo ansi G0:hs@:am:LP@:OP
-
-Now, I am not worried about its total accurracy, but I just wanted to show
-you what I tried.  I also fixed a screen-25 terminfo entry:
-
-screen-25|VT 100/ANSI X3.64 virtual terminal,
-	am, msgr, xon,
-	cols#80, it#8, lines#25,
-	bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z,
-	clear=\E[H\E[J, cr=\r, csr=\E[%i%p1%d;%p2%dr,
-	cub=\E[%p1%dD, cub1=\b, cud=\E[%p1%dB, cud1=\n,
-	cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH,
-	cuu=\E[%p1%dA, cuu1=\EM, dl=\E[%p1%dM, dl1=\E[M,
-	ed=\E[J, el=\E[K, home=\E[H, ht=\t, hts=\EH,
-	il=\E[%p1%dL, il1=\E[L, ind=\n, is2=\E)0, kbs=\b,
-	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
-	kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, khome=\E?,
-	ll=\E[25H, nel=\EE, rc=\E8, rev=\E[7m, ri=\EM,
-	rmkx=\E>, rmso=\E[23m, rmul=\E[24m, rs2=\Ec, sc=\E7,
-	sgr0=\E[m, smkx=\E=, smso=\E[3m, smul=\E[4m,
-	tbc=\E[3g,
-
-And notice for SCO Unix that I added 'am' to the entry for screen-25.  Even
-though the external (login shell) type 'ansi' was modified with the .screenrc,
-when I added 'am' to the screen window term screen-25, it functioned flawlessly
-and I am not sure why.  Anyway, vi and all the others seem to work great 
-now.  Next, I need to work on the G0 -> C0 graphics character mappings.  I 
-don't fully understand that yet.  Anyway, this should be of help to others
-under SCO.  BTW, that copy of the message you got from me that I sent to
-Ronald Khoo -- I applied SCO SLS patch xnx141 (for xenix) to fix the bug 
-in select() when dealing with pipes, and it solved my problems on xenix.
-
-Mark.
-
--- 
-Mark J. Bailey, N4XHX                              _______/====X11====\_______
-USMAIL: 511 Memorial Blvd., Murfreesboro, TN 37129 |         JobSoft         |
-VOICE:  +1 615 893 0098                            | Design & Development Co.|
-UUCP:   ...!uunet!mjbtn!mjb, ...!raider!mjbtn!mjb  |  Murfreesboro, TN  USA  |
-DOMAIN: mjb@mjbtn.JOBSOFT.COM      CIS: 76314,160  ---------------------------
-<KA9Q-UNIX-USERS Mailing List-Subscribe: ka9q-unix-requests@mjbtn.jobsoft.com>
-
diff --git a/terminfo/screencap b/terminfo/screencap
index 5738532..d2becd4 100644
--- a/terminfo/screencap
+++ b/terminfo/screencap
@@ -12,8 +12,8 @@ SC|screen|VT 100/ANSI X3.64 virtual terminal:\
 	:ku=\EOA:kd=\EOB:kr=\EOC:kl=\EOD:kb=^H:\
 	:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:k5=\E[15~:k6=\E[17~:\
 	:k7=\E[18~:k8=\E[19~:k9=\E[20~:k;=\E[21~:F1=\E[23~:F2=\E[24~:\
-	:kh=\E[1~:kI=\E[2~:kD=\E[3~:kH=\E[4~:kP=\E[5~:kN=\E[6~:\
-	:eA=\E(B\E)0:as=^N:ae=^O:\
+	:kh=\E[1~:kI=\E[2~:kD=\E[3~:kH=\E[4~:@7=\E[4~:kP=\E[5~:\
+	:kN=\E[6~:eA=\E(B\E)0:as=^N:ae=^O:\
 	:vi=\E[?25l:ve=\E[34h\E[?25h:vs=\E[34l:\
 	:Co#8:pa#64:AF=\E[3%dm:AB=\E[4%dm:op=\E[39;49m:AX:\
 	:ac=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~..--++,,hhII00:
diff --git a/terminfo/screeninfo.src b/terminfo/screeninfo.src
index ab17d2d..b7e0c7f 100644
--- a/terminfo/screeninfo.src
+++ b/terminfo/screeninfo.src
@@ -13,7 +13,7 @@ screen|VT 100/ANSI X3.64 virtual terminal,
 	kcuf1=\EOC, kcuu1=\EOA, kdch1=\E[3~, kf1=\EOP,
 	kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf2=\EOQ,
 	kf3=\EOR, kf4=\EOS, kf5=\E[15~, kf6=\E[17~,
-	kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, khome=\E[1~,
+	kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, khome=\E[1~, kend=\E[4~,
 	kich1=\E[2~, kll=\E[4~, knp=\E[6~, kpp=\E[5~, nel=\EE,
 	rc=\E8, rev=\E[7m, ri=\EM, rmir=\E[4l, rmkx=\E[?1l\E>,
 	rmso=\E[23m, rmul=\E[24m, rs2=\Ec, sc=\E7, sgr0=\E[m,
@@ -37,7 +37,7 @@ screen-w|VT 100/ANSI X3.64 virtual terminal with 132 cols,
 	kcuf1=\EOC, kcuu1=\EOA, kdch1=\E[3~, kf1=\EOP,
 	kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf2=\EOQ,
 	kf3=\EOR, kf4=\EOS, kf5=\E[15~, kf6=\E[17~,
-	kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, khome=\E[1~,
+	kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, khome=\E[1~, kend=\E[4~,
 	kich1=\E[2~, kll=\E[4~, knp=\E[6~, kpp=\E[5~, nel=\EE,
 	rc=\E8, rev=\E[7m, ri=\EM, rmir=\E[4l, rmkx=\E[?1l\E>,
 	rmso=\E[23m, rmul=\E[24m, rs2=\Ec, sc=\E7, sgr0=\E[m,