Update to xterm 273. Tested by marco@, jasper@.

1 files changed, 16 insertions, 8 deletions

diff --git a/app/xterm/terminfo b/app/xterm/terminfo
index 5d1b297cf..9c365e6e9 100644
--- a/app/xterm/terminfo
+++ b/app/xterm/terminfo
@@ -1,4 +1,4 @@
-# $XTermId: terminfo,v 1.156 2011/07/04 11:11:43 tom Exp $
+# $XTermId: terminfo,v 1.158 2011/08/16 22:27:46 tom Exp $
 #
 # $XFree86: xc/programs/xterm/terminfo,v 3.59 2006/02/13 01:14:59 dickey Exp $
 #
@@ -939,7 +939,6 @@ xterm-basic|modern xterm terminal emulator - common,
 	ind=^J,
 	invis=\E[8m,
 	is2=\E[!p\E[?3;4l\E[4l\E>,
-	kbs=^H,
 	kmous=\E[M,
 	mc0=\E[i,
 	mc4=\E[4i,
@@ -981,6 +980,7 @@ xterm-basic|modern xterm terminal emulator - common,
 	u8=\E[?1;2c,
 	u9=\E[c,
 	vpa=\E[%i%p1%dd,
+	use=xterm+kbs,
 #
 # The xterm-new description has all of the features, but is not completely
 # compatible with vt220.  If you are using a Sun or PC keyboard, set the
@@ -1054,7 +1054,6 @@ xterm-vt52|xterm emulating dec vt52,
 	home=\EH,
 	ht=^I,
 	ind=^J,
-	kbs=^H,
 	kcub1=\ED,
 	kcud1=\EB,
 	kcuf1=\EC,
@@ -1063,6 +1062,7 @@ xterm-vt52|xterm emulating dec vt52,
 	ri=\EI,
 	rmacs=\EG,
 	smacs=\EF,
+	use=xterm+kbs,
 #
 # Sun does not number the function keys this way in their sparse termcap; their
 # terminal descriptions ignore the keypads.  kb(7M) states that there are codes
@@ -1419,13 +1419,14 @@ xterm-16color|xterm with 16 colors,
 	setaf=\E[%?%p1%{8}%<%t%p1%{30}%+%e%p1%{82}%+%;%dm,
 	setb=%p1%{8}%/%{6}%*%{4}%+\E[%d%p1%{8}%m%Pa%?%ga%{1}%=%t4%e%ga%{3}%=%t6%e%ga%{4}%=%t1%e%ga%{6}%=%t3%e%ga%d%;m,
 	setf=%p1%{8}%/%{6}%*%{3}%+\E[%d%p1%{8}%m%Pa%?%ga%{1}%=%t4%e%ga%{3}%=%t6%e%ga%{4}%=%t1%e%ga%{6}%=%t3%e%ga%d%;m,
+	use=xterm+256color,
 	use=xterm-new,
 #
 # This uses RGB values 0..1000
 #
 # 256 colors should give 65536 pairs, but terminfo stores numbers in a signed
 # short.  Most people will not notice problems with only 32767 pairs.
-xterm-256color|xterm with 256 colors,
+xterm+256color|xterm 256-color feature,
 	ccc,
 	colors#256,
 	pairs#32767,
@@ -1434,6 +1435,8 @@ xterm-256color|xterm with 256 colors,
 	setaf=\E[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5;%p1%d%;m,
 	setb@,
 	setf@,
+xterm-256color|xterm with 256 colors,
+	use=xterm+256color,
 	use=xterm-new,
 xterm-88color|xterm with 88 colors,
 	colors#88,
@@ -1508,7 +1511,6 @@ xterm-8bit|xterm terminal emulator with 8-bit controls (X Window System),
 	ka3=\217u,
 	kb2=\217y,
 	kbeg=\217E,
-	kbs=^H,
 	kc1=\217q,
 	kc3=\217s,
 	kcbt=\233Z,
@@ -1582,6 +1584,7 @@ xterm-8bit|xterm terminal emulator with 8-bit controls (X Window System),
 	u8=\233[?1;2c,
 	u9=\E[c,
 	vpa=\233%i%p1%dd,
+	use=xterm+kbs,
 #
 xterm-xf86-v44|xterm terminal emulator (XFree86 4.4 Window System),
 	OTbs,
@@ -1649,7 +1652,6 @@ xterm-xf86-v44|xterm terminal emulator (XFree86 4.4 Window System),
 	kPRV=\E[5;2~,
 	kRIT=\E[1;2C,
 	kb2=\EOE,
-	kbs=^H,
 	kcbt=\E[Z,
 	kcub1=\EOD,
 	kcud1=\EOB,
@@ -1754,6 +1756,7 @@ xterm-xf86-v44|xterm terminal emulator (XFree86 4.4 Window System),
 	kb1=\EOt,
 	kb3=\EOv,
 	kc2=\EOr,
+	use=xterm+kbs,
 xterm-xfree86|xterm terminal emulator (XFree86 4.4 Window System),
 	use=xterm-xf86-v44,
 #
@@ -1802,7 +1805,6 @@ xterm-r6|xterm-old|xterm X11R6 version,
 	il1=\E[L,
 	ind=^J,
 	is2=\E[m\E[?7h\E[4l\E>\E7\E[r\E[?1;3;4;6l\E8,
-	kbs=^H,
 	kcub1=\EOD,
 	kcud1=\EOB,
 	kcuf1=\EOC,
@@ -1854,6 +1856,7 @@ xterm-r6|xterm-old|xterm X11R6 version,
 	u7=\E[6n,
 	u8=\E[?1;2c,
 	u9=\E[c,
+	use=xterm+kbs,
 	use=xterm+decedit,
 #
 # Compatible with the R5 xterm, with the following changes:
@@ -1905,7 +1908,6 @@ xterm-r5|xterm R5 version,
 	il=\E[%p1%dL,
 	il1=\E[L,
 	ind=^J,
-	kbs=^H,
 	kcub1=\EOD,
 	kcud1=\EOB,
 	kcuf1=\EOC,
@@ -1953,6 +1955,7 @@ xterm-r5|xterm R5 version,
 	u7=\E[6n,
 	u8=\E[?1;2c,
 	u9=\E[c,
+	use=xterm+kbs,
 #
 #
 # Customization begins here.
@@ -1963,3 +1966,8 @@ xterm-r5|xterm R5 version,
 xterm|X11 terminal emulator,
 	use=xterm-new,
 #	use=xterm-r6,
+
+# This fragment is for people who cannot agree on what the backspace key
+# should send.
+xterm+kbs|fragment for backspace key,
+	kbs=^H,