1) Remove all two-letters names and derivates, comes with Xfree* entries spam,

we don't use two-letters names already many years.
2) Make xterm-color just plain alias to xterm instead of unnecessary
reduplication of color capabilities already exist in xterm entry.

1 files changed, 24 insertions, 35 deletions

diff --git a/share/termcap/termcap.src b/share/termcap/termcap.src
index ea4495b..80cef22 100644
--- a/share/termcap/termcap.src
+++ b/share/termcap/termcap.src
@@ -2753,7 +2753,7 @@ SW|screen-w|VT 100/ANSI X3.64 virtual terminal with 132 cols:\
 #
 # $XFree86: xc/programs/xterm/termcap,v 3.28 2001/01/17 23:46:39 dawes Exp $
 #
-xf|xterm-xfree86|XFree86 xterm:\
+xterm-xfree86|XFree86 xterm:\
 	: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~:\
@@ -2762,7 +2762,7 @@ xf|xterm-xfree86|XFree86 xterm:\
 	:ku=\EOA:kd=\EOB:kr=\EOC:kl=\EOD:Km=\E[M:tc=xterm-basic:
 #
 # This chunk is used for building the VT220/Sun/PC keyboard variants.
-xb|xterm-basic|xterm common (XFree86):\
+xterm-basic|xterm common (XFree86):\
 	:li#24:co#80:am:kn#12:km:mi:ms:xn:bl=^G:\
 	:is=\E[!p\E[?3;4l\E[4l\E>:rs=\E[!p\E[?3;4l\E[4l\E>:\
 	:AL=\E[%dL:DL=\E[%dM:DC=\E[%dP:al=\E[L:dc=\E[P:dl=\E[M:\
@@ -2784,50 +2784,39 @@ xb|xterm-basic|xterm common (XFree86):\
 #	+ maps numeric keypad "+" to ",".
 #	+ uses DEC-style control sequences for the application keypad.
 #
-vt|xterm-vt220|xterm emulating vt220:\
+xterm-vt220|xterm emulating vt220:\
 	:kH=\E[4~::@7=\E[4~:*6=\E[4~:kh=\E[1~:Km=\E[M:tc=xterm-basic:
 
-v1|xterm-24|xterms|vs100|24x80 xterm:\
+xterm-24|xterms|vs100|24x80 xterm:\
 	:li#24:\
 	:tc=xterm:
-v2|xterm-65|65x80 xterm:\
+xterm-65|65x80 xterm:\
 	:li#65:tc=xterm:
-vb|xterm-bold|xterm with bold for underline:\
+xterm-bold|xterm with bold for underline:\
 	:so=\E[7m:us=\E[1m:tc=xterm:
-vbso|xterm-boldso|xterm with bold for standout:\
+xterm-boldso|xterm with bold for standout:\
 	:se=\E[m:so=\E[1m:tc=xterm:
-vm|xterm-mono|monochrome xterm:\
+xterm-mono|monochrome xterm:\
 	:kn#20:\
 	:st@:ut@:Co@:NC@:op@:AB@:AF@:pa@:Sf@:Sb@:tc=xterm:
 #
 # Alternate terminal description that "works" for interactive shells such as
 # tcsh and bash.
-xnoapp|xterm-noapp|xterm with cursor keys in normal mode:\
+xterm-noapp|xterm with cursor keys in normal mode:\
 	kl=\E[D:kd=\E[B:kr=\E[C:ku=\E[A:ks=\E=:ke=\E>:ti@:te@:tc=xterm:
 #
-# This should work for the commonly used "color xterm" variations (XFree86
-# xterm, color_xterm, nxterm, rxvt).  Note that it does not set 'bce', so for
-# XFree86 and and rxvt, some applications that use colors will be less
-# efficient, and in a few special cases (with "smart" optimization) the wrong
-# color will be painted in spots.
-vc|generic "ANSI" color xterm:\
-	:Co#8:NC@:pa#64:op=\E[m:AB=\E[4%dm:AF=\E[3%dm:ac@:tc=xterm-r6:
-#
-xterm-color|xterm-co|xterm with ANSI colors:\
-	:pa#64:Co#8:AF=\E[3%dm:AB=\E[4%dm:op=\E[39;49m:tc=xterm:
-#
 # These aliases are for compatibility with the terminfo; termcap cannot provide
 # the extra features, but termcap applications still want the names.
-x1|xterm-16color|xterm alias 1:tc=xterm-xfree86:
-x2|xterm-88color|xterm alias 2:tc=xterm-256color:
-x3|xterm-256color|xterm alias 3:tc=xterm-xfree86:
-xn|xterm-nrc|xterm alias 4:tc=xterm:
-xr|xterm-rep|xterm alias 5:tc=xterm:
-xx|xterm-xmc|xterm alias 6:sg#1:tc=xterm:
+xterm-16color|xterm alias 1:tc=xterm-xfree86:
+xterm-88color|xterm alias 2:tc=xterm-256color:
+xterm-256color|xterm alias 3:tc=xterm-xfree86:
+xterm-nrc|xterm alias 4:tc=xterm:
+xterm-rep|xterm alias 5:tc=xterm:
+xterm-xmc|xterm alias 6:sg#1:tc=xterm:
 #
 # An 8-bit description is doable with termcap, but there are probably no
 # termcap (or BSD curses) applications that are able to use it.
-x8|xterm-8bit|xterm terminal emulator 8-bit controls (X Window System):\
+xterm-8bit|xterm terminal emulator 8-bit controls (X Window System):\
 	:co#80:li#24:\
 	:it#8:am:km:mi:ms:xn:\
 	:AL=\233%dL:DC=\233%dP:DL=\233%dM:DO=\233%dB:IC=\233%d@:LE=\233%dD:\
@@ -2845,12 +2834,12 @@ x8|xterm-8bit|xterm terminal emulator 8-bit controls (X Window System):\
 	:st=\210:ta=^I:te=\233?1049l:ti=\233?1049h:ue=\23324m:us=\2334m:\
 	:vb=\233?5h\233?5l:ve=\233?25h:vi=\233?25l:Km=\233M:
 #
-xh|xterm-hp|XFree86 xterm with hpterm function keys:\
+xterm-hp|XFree86 xterm with hpterm function keys:\
 	:k1=\Ep:k2=\Eq:k3=\Er:k4=\Es:k5=\Et:k6=\Eu:k7=\Ev:k8=\Ew:\
 	:kC=\EJ:kD=\EP:@7=\EF:kI=\EQ:kN=\ES:kP=\ET:kh=\Eh:\
 	:kd=\EB:kl=\ED:kr=\EC:ku=\EA:tc=xterm-basic:
 #
-xS|xterm-sco|XFree86 xterm with SCO function keys:\
+xterm-sco|XFree86 xterm with SCO function keys:\
 	:kl=\E[D:kd=\E[B:kr=\E[C:ku=\E[A:@7=\E[F:\
 	:k1=\E[M:k2=\E[N:k3=\E[O:k4=\E[P:k5=\E[Q:\
 	:k6=\E[R:k7=\E[S:k8=\E[T:k9=\E[U:k;=\E[V:\
@@ -2859,14 +2848,14 @@ xS|xterm-sco|XFree86 xterm with SCO function keys:\
 	:FC=\E[h:FD=\E[i:FE=\E[j:FF=\E[k:\
 	:kh=\E[H:kI=\E[L:kN=\E[G:kP=\E[I:ac@:tc=xterm-basic:
 #
-v5|xterm-vt52|xterm emulating vt52:\
+xterm-vt52|xterm emulating vt52:\
 	:bs:\
 	:co#80:it#8:li#24:\
 	:ae=\EG:as=\EF:bl=^G:cd=\EJ:ce=\EK:cl=\EH\EJ:cm=\EY%+ %+ :\
 	:cr=^M:do=\EB:ho=\EH:kb=^H:kd=\EB:kl=\ED:kr=\EC:ku=\EA:\
 	:le=\ED:nd=\EC:nw=^M^J:sf=^J:sr=\EI:ta=^I:up=\EA:
 #
-xs|xterm-sun|xterm with Sun functionkeys:\
+xterm-sun|xterm with Sun functionkeys:\
 	:k1=\E[224z:k2=\E[225z:k3=\E[226z:k4=\E[227z:\
 	:k5=\E[228z:k6=\E[229z:k7=\E[230z:k8=\E[231z:\
 	:k9=\E[232z:k;=\E[233z:F1=\E[192z:F2=\E[193z:\
@@ -2877,11 +2866,11 @@ xs|xterm-sun|xterm with Sun functionkeys:\
 #
 # vi may work better with this entry, because vi doesn't use insert mode much.
 # |xterm-ic|xterm-vi|xterm with insert character instead of insert mode:\
-vi|xterm-ic|xterm-vi|xterm with insert char:\
+xterm-ic|xterm-vi|xterm with insert char:\
 	:im@:ei@:mi@:ic=\E[@:IC=\E[%d@:tc=xterm:
 #
 # Compatible with the X11R6.3 xterm
-r6|xterm-r6|xterm-old|X11R6 xterm:\
+xterm-r6|xterm-old|X11R6 xterm:\
 	:is=\E[m\E[?7h\E[4l\E>\E7\E[r\E[?1;3;4;6l\E8:\
 	:rs=\E[m\E[?7h\E[4l\E>\E7\E[r\E[?1;3;4;6l\E8:\
 	:AL=\E[%dL:DL=\E[%dM:DC=\E[%dP:DO=\E[%dB:UP=\E[%dA:\
@@ -2901,7 +2890,7 @@ r6|xterm-r6|xterm-old|X11R6 xterm:\
 	:ti=\E7\E[?47h:te=\E[2J\E[?47l\E8:up=\E[A:us=\E[4m:ue=\E[m:xn:
 #
 # Compatible with the R5 xterm
-r5|xterm-r5|X11R5 xterm X11R5:\
+xterm-r5|X11R5 xterm X11R5:\
 	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:UP=\E[%dA:\
 	:al=\E[L:am:\
 	:bs:cd=\E[J:ce=\E[K:cl=\E[H\E[2J:cm=\E[%i%d;%dH:co#80:\
@@ -2922,7 +2911,7 @@ r5|xterm-r5|X11R5 xterm X11R5:\
 # This is the only entry which you should have to customize, since "xterm"
 # is widely used for a variety of incompatible terminal emulations including
 # color_xterm and rxvt.
-v0|xterm|X11 terminal emulator:\
+xterm|xterm-color|X11 terminal emulator:\
 	:ti@:te@:tc=xterm-xfree86:
 #	:tc=xterm-r6:
 # dtterm termcap entry - Obtained from Xinside's CDE with permission