Merge two entries: cons25 and pc3r, minor things added/corrected

Now use tc=cons25 in pc3r, leave only uniq capabilities

1 files changed, 6 insertions, 16 deletions

diff --git a/share/termcap/termcap.src b/share/termcap/termcap.src
index 391781f..08ac41d 100644
--- a/share/termcap/termcap.src
+++ b/share/termcap/termcap.src
@@ -1957,13 +1957,13 @@ c100-rv-s|concept-rv-s|concept100-rv-s|c100rvs|slow reverse concept 100:\
 # for syscons
 cons25|ansi|ansi80x25:\
 	:ac=l\332m\300k\277j\331u\264t\303v\301w\302q\304x\263n\305o~s_`^Da\260f\370g\361~\371.^Y-^Xh\261I^U0\333y\363z\362:\
-        :al=\E[L:am:bs:cd=\E[J:ce=\E[K:cl=\E[2J\E[H:cm=\E[%i%d;%dH:co#80:\
-	:dc=\E[P:dl=\E[M:do=^J:bt=\E[Z:ei=:ho=\E[H:ic=\E[@:im=:li#25:\
-	:ms:nd=\E[C:pt:rs=\E[x\E[m\Ec:so=\E[7m:se=\E[m:us=\E[4m:ue=\E[m:up=\E[A:\
+	:al=\E[L:am:bs:cd=\E[J:ce=\E[K:cl=\E[H\E[J:cm=\E[%i%d;%dH:co#80:\
+	:dc=\E[P:dl=\E[M:do=^J:bt=\E[Z:ho=\E[H:ic=\E[@:li#25:\
+	:ms:nd=\E[C:pt:rs=\E[x\E[m\Ec:so=\E[7m:se=\E[m:up=\E[A:\
 	:pa#64:Co#8:Sf=\E[3%dm:Sb=\E[4%dm:op=\E[37;40m:\
 	: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:F1=\E[W:F2=\E[X:\
-	:kb=^h:ku=\E[A:kd=\E[B:kl=\E[D:kr=\E[C:le=^H:eo:sf=\E[S:sr=\E[T:\
+	:kb=^H:kh=\E[H:ku=\E[A:kd=\E[B:kl=\E[D:kr=\E[C:le=^H:eo:sf=\E[S:sr=\E[T:\
 	:kN=\E[G:kP=\E[I:@7=\E[F:kI=\E[L:kD=\E[K:kB=\E[Z:\
 	:IC=\E[%d@:DC=\E[%dP:SF=\E[%dS:SR=\E[%dT:AL=\E[%dL:DL=\E[%dM:\
 	:DO=\E[%dB:LE=\E[%dD:RI=\E[%dC:UP=\E[%dA:bw:\
@@ -1972,19 +1972,9 @@ cons50|ansil|ansi80x50:\
         :li#50:tc=cons25:
 # Syscons console with koi8-r russian code table.
 pc3r|ibmpc3r|FreeBSD console for syscons koi8-r code table:\
-	:li#25:co#80:am:bs:bw:eo:bl=^G:it#8:\
-	:UP=\E[%dA:DO=\E[%dB:RI=\E[%dC:LE=\E[%dD:AL=\E[%dL:DL=\E[%dM:\
-	:IC=\E[%d@:DC=\E[%dP:le=^H:ic=\E[@:dc=\E[P:cd=\E[J:ce=\E[K:cl=\E[H\E[J:\
-	:cm=\E[%i%d;%dH:do=^J:ho=\E[H:al=\E[L:dl=\E[M:nd=\E[C:up=\E[A:\
-	:so=\E[7m:se=\E[m:ms:rs=\E[x\E[m\Ec:pt:ut:\
-	:mb=\E[5m:mr=\E[7m:md=\E[1m:mh=\E[30;1m:me=\E[m:\
-	:kb=^H:kh=\E[H:ku=\E[A:kd=\E[B:kl=\E[D:kr=\E[C:\
-	:kN=\E[G:kP=\E[I:@7=\E[F:kI=\E[L:kD=\E[K:kB=\E[Z:K2=\E[E:\
-	: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:F1=\E[W:F2=\E[X:\
-	:sr=\E[T:sf=\E[S:SR=\E[%dT:SF=\E[%dS:\
+	:K2=\E[E:\
 	:ac=q\200x\201m\204v\211j\205t\206n\212u\207l\202w\210k\203y\230z\231f\234~\225a\220h\221o~s_`^D.^Y-^XI^U0\215:\
-	:pa#64:Co#8:Sf=\E[3%dm:Sb=\E[4%dm:op=\E[37;40m:
+	:tc=cons25:
 dosansi|ANSI.SYS standard crt:\
         :am:bs:ce=\E[K:cl=\E[2J:cm=\E[%i%d;%dH:co#80:\
         :do=\E[B:li#25:mi:nd=\E[C:\