---- xc/programs/xterm/XTerm-col.ad.orig 2003-09-25 13:06:59.000000000 +0200
-+++ xc/programs/xterm/XTerm-col.ad 2003-10-01 20:48:30.453913496 +0200
-@@ -11,8 +11,8 @@
- !*VT100*background: black
-
- ! Uncomment this to use color for underline attribute
--!*VT100*colorULMode: on
--!*VT100*underLine: off
-+*VT100*colorULMode: on
-+*VT100*underLine: on
-
- ! Uncomment this to use color for the bold attribute
- !*VT100*colorBDMode: on
---- xc/programs/xterm/XTerm.ad.orig 2003-09-25 13:06:59.000000000 +0200
-+++ xc/programs/xterm/XTerm.ad 2003-10-01 20:49:35.565015104 +0200
-@@ -107,3 +107,180 @@
- *tek4014*font2: 8x13
+--- xc/programs/xterm/XTerm.ad.orig 2006-04-10 02:34:36.000000000 +0200
++++ xc/programs/xterm/XTerm.ad 2006-06-11 03:08:24.065471976 +0200
+@@ -115,6 +115,183 @@
*tek4014*font3: 6x13
*tek4014*fontSmall: 6x10
-+
+
+! This file causes when loaded using xrdb correct behaviour of xterm
+! if you are using enclosed xterm.tcap and xterm.ti.
+! Some keys would never normally work if they weren't here (like Alt
+! On some systems you may want to replace the a (alt) modifiers with
+! m (meta) modifier in front of some <Key> events.
+*vt100.translations: #override \
-+ Alt Ctrl<Btn4Down>: string(0x1b) string("OA")\n\
-+ Alt Ctrl<Btn5Down>: string(0x1b) string("OB")\n\
-+ Alt<Btn4Down>: string(0x1b) string("OA") string(0x1b) string("OA") string(0x1b) string("OA") string(0x1b) string("OA") string(0x1b) string("OA")\n\
-+ Alt<Btn5Down>: string(0x1b) string("OB") string(0x1b) string("OB") string(0x1b) string("OB") string(0x1b) string("OB") string(0x1b) string("OB")\n\
-+ Shift<Btn4Down>: scroll-back(1,page)\n\
-+ Shift<Btn5Down>: scroll-forw(1,page)\n\
-+ Ctrl<Btn4Down>: scroll-back(1,line)\n\
-+ Ctrl<Btn5Down>: scroll-forw(1,line)\n\
-+ <Btn4Down>: scroll-back(5,line)\n\
-+ <Btn5Down>: scroll-forw(5,line)\n\
-+ @Num_Lock<Key>KP_0: string(0)\n\
-+ @Num_Lock<Key>KP_1: string(1)\n\
-+ @Num_Lock<Key>KP_2: string(2)\n\
-+ @Num_Lock<Key>KP_3: string(3)\n\
-+ @Num_Lock<Key>KP_4: string(4)\n\
-+ @Num_Lock<Key>KP_5: string(5)\n\
-+ @Num_Lock<Key>KP_6: string(6)\n\
-+ @Num_Lock<Key>KP_7: string(7)\n\
-+ @Num_Lock<Key>KP_8: string(8)\n\
-+ @Num_Lock<Key>KP_9: string(9)\n\
-+ @Num_Lock<Key>KP_Add: string(+)\n\
-+ @Num_Lock<Key>KP_Decimal: string(.)\n\
-+ @Num_Lock<Key>KP_Divide: string(/)\n\
-+ @Num_Lock<Key>KP_Enter: string(\015)\n\
-+ @Num_Lock<Key>KP_Equal: string(=)\n\
-+ @Num_Lock<Key>KP_Multiply: string(*)\n\
-+ @Num_Lock<Key>KP_Subtract: string(-)\n\
-+ <Key>KP_Add: string(+)\n\
-+ <Key>KP_Divide: string(/)\n\
-+ <Key>KP_Enter: string(\015)\n\
-+ <Key>KP_Equal: string(=)\n\
-+ <Key>KP_Multiply: string(*)\n\
-+ <Key>KP_Subtract: string(-)\n\
-+ Shift<Key>KP_Home: scroll-back(100,page)\n\
-+ Shift<Key>KP_End: scroll-forw(100,page)\n\
-+ <Key>KP_Home: string(0x1b) string("[1~")\n\
-+ <Key>KP_End: string(0x1b) string("[4~")\n\
-+ Shift<Key>Prior:scroll-back(1,page)\n\
-+ Shift<Key>Next:scroll-forw(1,page)\n\
-+ <Key>F16: start-extend() select-end(PRIMARY, CUT_BUFFER0, CLIPBOARD)\n\
-+ <Key>F18: insert-selection(PRIMARY, CLIPBOARD)\n\
-+ <Key>F27: scroll-back(100,page)\n\
-+ <Key>R13: scroll-forw(100,page)\n\
-+ Ctrl<Key>Home: string(0x1b) string("[1;5H")\n\
-+ Shift<Key>Home: string(0x1b) string("[1;2H")\n\
-+ ~Meta<Key>Home: string(0x1b) string("[1~")\n\
-+ Meta<Key>Home: string(0x1b) string(0x1b) string("[1~")\n\
-+ Ctrl<Key>End: string(0x1b) string("[1;5F")\n\
-+ Shift<Key>End: string(0x1b) string("[1;2F")\n\
-+ ~Meta<Key>End: string(0x1b) string("[4~")\n\
-+ Meta<Key>End: string(0x1b) string(0x1b) string("[4~")\n\
-+ Ctrl<Key>Insert: string(0x1b) string("[2;5~")\n\
-+ Shift<Key>Insert: string(0x1b) string("[2;2~")\n\
-+ ~Meta<Key>Insert: string(0x1b) string("[2~")\n\
-+ Meta<Key>Insert: string(0x1b) string(0x1b) string("[2~")\n\
-+ Ctrl<Key>Delete: string(0x1b) string("[3;5~")\n\
-+ Shift<Key>Delete: string(0x1b) string("[3;2~")\n\
-+ ~Meta<Key>Delete: string(0x1b) string("[3~")\n\
-+ Meta<Key>Delete: string(0x1b) string(0x1b) string("[3~")\n\
-+ Ctrl<Key>Page_Up: string(0x1b) string("[5;5~")\n\
-+ ~Meta<Key>Page_Up: string(0x1b) string("[5~")\n\
-+ Meta<Key>Page_Up: string(0x1b) string(0x1b) string("[5~")\n\
-+ Ctrl<Key>Page_Down: string(0x1b) string("[6;5~")\n\
-+ ~Meta<Key>Page_Down: string(0x1b) string("[6~")\n\
-+ Meta<Key>Page_Down: string(0x1b) string(0x1b) string("[6~")\n\
-+ ~Meta<Key>BackSpace: string(0x08)\n\
-+ Meta<Key>BackSpace: string(0x1b) string(0x08)\n\
-+ Ctrl Shift<Key>Up: string(0x1b) string("[1;6A")\n\
-+ Ctrl<Key>Up: string(0x1b) string("[1;5A")\n\
-+ Shift<Key>Up: string(0x1b) string("O2A")\n\
-+ ~Meta<Key>Up: string(0x1b) string("OA")\n\
-+ Meta<Key>Up: string(0x1b) string(0x1b) string("OA")\n\
-+ Ctrl Shift<Key>Down: string(0x1b) string("[1;6B")\n\
-+ Ctrl<Key>Down: string(0x1b) string("[1;5B")\n\
-+ Shift<Key>Down: string(0x1b) string("O2B")\n\
-+ ~Meta<Key>Down: string(0x1b) string("OB")\n\
-+ Meta<Key>Down: string(0x1b) string(0x1b) string("OB")\n\
-+ Ctrl Shift<Key>Left: string(0x1b) string("[1;6D")\n\
-+ Ctrl<Key>Left: string(0x1b) string("[1;5D")\n\
-+ Shift<Key>Left: string(0x1b) string("O2D")\n\
-+ ~Meta<Key>Left: string(0x1b) string("OD")\n\
-+ Meta<Key>Left: string(0x1b) string(0x1b) string("OD")\n\
-+ Ctrl Shift<Key>Right: string(0x1b) string("[1;6C")\n\
-+ Ctrl<Key>Right: string(0x1b) string("[1;5C")\n\
-+ Shift<Key>Right: string(0x1b) string("O2C")\n\
-+ ~Meta<Key>Right: string(0x1b) string("OC")\n\
-+ Meta<Key>Right: string(0x1b) string(0x1b) string("OC")\n\
-+ ~Meta<Key>Return: string(0x0d)\n\
-+ Meta<Key>Return: string(0x1b) string(0x0d)\n\
-+ ~Meta<Key>Tab: string(0x09)\n\
-+ Meta<Key>Tab: string(0x1b) string(0x09)\n\
-+ ~s<Key>F1: string(0x1b) string("[11~")\n\
-+ ~s<Key>F2: string(0x1b) string("[12~")\n\
-+ ~s<Key>F3: string(0x1b) string("[13~")\n\
-+ ~s<Key>F4: string(0x1b) string("[14~")\n\
-+ ~s<Key>F5: string(0x1b) string("[15~")\n\
-+ ~s<Key>F6: string(0x1b) string("[17~")\n\
-+ ~s<Key>F7: string(0x1b) string("[18~")\n\
-+ ~s<Key>F8: string(0x1b) string("[19~")\n\
-+ ~s<Key>F9: string(0x1b) string("[20~")\n\
-+ ~s<Key>F10: string(0x1b) string("[21~")\n\
-+ <Key>F11: string(0x1b) string("[23~")\n\
-+ <Key>F12: string(0x1b) string("[24~")\n\
-+ <Key>F13: string(0x1b) string("[25~")\n\
-+ <Key>F14: string(0x1b) string("[26~")\n\
-+ <Key>F15: string(0x1b) string("[28~")\n\
-+ <Key>F16: string(0x1b) string("[29~")\n\
-+ <Key>F17: string(0x1b) string("[31~")\n\
-+ <Key>F18: string(0x1b) string("[32~")\n\
-+ <Key>F19: string(0x1b) string("[33~")\n\
-+ <Key>F20: string(0x1b) string("[34~")\n\
-+ s<Key>F1: string(0x1b) string("[23~")\n\
-+ s<Key>F2: string(0x1b) string("[24~")\n\
-+ s<Key>F3: string(0x1b) string("[25~")\n\
-+ s<Key>F4: string(0x1b) string("[26~")\n\
-+ s<Key>F5: string(0x1b) string("[28~")\n\
-+ s<Key>F6: string(0x1b) string("[29~")\n\
-+ s<Key>F7: string(0x1b) string("[31~")\n\
-+ s<Key>F8: string(0x1b) string("[32~")\n\
-+ s<Key>F9: string(0x1b) string("[33~")\n\
-+ s<Key>F10: string(0x1b) string("[34~")\n\
-+ a<Key>Return: string(0x1b) string(0x0d)\n\
-+ a<Key>Tab: string(0x1b) string(0x09)\n\
-+ a<Key>space: string(0x1b) string(" ")\n\
-+ a s<Key>question: string(0x1b) string("?")\n\
-+ a s<Key>exclam: string(0x1b) string("!")\n\
-+ a<Key>1: string(0x1b) string("1")\n\
-+ a<Key>2: string(0x1b) string("2")\n\
-+ a<Key>3: string(0x1b) string("3")\n\
-+ a<Key>4: string(0x1b) string("4")\n\
-+ a<Key>5: string(0x1b) string("5")\n\
-+ a<Key>6: string(0x1b) string("6")\n\
-+ a<Key>7: string(0x1b) string("7")\n\
-+ a<Key>8: string(0x1b) string("8")\n\
-+ a<Key>9: string(0x1b) string("9")\n\
-+ a<Key>0: string(0x1b) string("0")\n\
-+ a<Key>a: string(0x1b) string("a")\n\
-+ a<Key>b: string(0x1b) string("b")\n\
-+ a<Key>c: string(0x1b) string("c")\n\
-+ a<Key>d: string(0x1b) string("d")\n\
-+ a<Key>e: string(0x1b) string("e")\n\
-+ a<Key>f: string(0x1b) string("f")\n\
-+ a<Key>g: string(0x1b) string("g")\n\
-+ a s<Key>h: string(0x1b) string("H")\n\
-+ a<Key>h: string(0x1b) string("h")\n\
-+ a<Key>i: string(0x1b) string("i")\n\
-+ a<Key>j: string(0x1b) string("j")\n\
-+ a<Key>k: string(0x1b) string("k")\n\
-+ a<Key>l: string(0x1b) string("l")\n\
-+ a<Key>m: string(0x1b) string("m")\n\
-+ a<Key>n: string(0x1b) string("n")\n\
-+ a<Key>o: string(0x1b) string("o")\n\
-+ a<Key>p: string(0x1b) string("p")\n\
-+ a<Key>q: string(0x1b) string("q")\n\
-+ a<Key>r: string(0x1b) string("r")\n\
-+ a<Key>s: string(0x1b) string("s")\n\
-+ a<Key>t: string(0x1b) string("t")\n\
-+ a<Key>u: string(0x1b) string("u")\n\
-+ a<Key>v: string(0x1b) string("v")\n\
-+ a<Key>w: string(0x1b) string("w")\n\
-+ a<Key>x: string(0x1b) string("x")\n\
-+ a<Key>y: string(0x1b) string("y")\n\
-+ a<Key>z: string(0x1b) string("z")
++ Alt Ctrl<Btn4Down>: string(0x1b) string("OA")\n\
++ Alt Ctrl<Btn5Down>: string(0x1b) string("OB")\n\
++ Alt<Btn4Down>: string(0x1b) string("OA") string(0x1b) string("OA") string(0x1b) string("OA") string(0x1b) string("OA") string(0x1b) string("OA")\n\
++ Alt<Btn5Down>: string(0x1b) string("OB") string(0x1b) string("OB") string(0x1b) string("OB") string(0x1b) string("OB") string(0x1b) string("OB")\n\
++ Shift<Btn4Down>: scroll-back(1,page)\n\
++ Shift<Btn5Down>: scroll-forw(1,page)\n\
++ Ctrl<Btn4Down>: scroll-back(1,line)\n\
++ Ctrl<Btn5Down>: scroll-forw(1,line)\n\
++ <Btn4Down>: scroll-back(5,line)\n\
++ <Btn5Down>: scroll-forw(5,line)\n\
++ @Num_Lock<Key>KP_0: string(0)\n\
++ @Num_Lock<Key>KP_1: string(1)\n\
++ @Num_Lock<Key>KP_2: string(2)\n\
++ @Num_Lock<Key>KP_3: string(3)\n\
++ @Num_Lock<Key>KP_4: string(4)\n\
++ @Num_Lock<Key>KP_5: string(5)\n\
++ @Num_Lock<Key>KP_6: string(6)\n\
++ @Num_Lock<Key>KP_7: string(7)\n\
++ @Num_Lock<Key>KP_8: string(8)\n\
++ @Num_Lock<Key>KP_9: string(9)\n\
++ @Num_Lock<Key>KP_Add: string(+)\n\
++ @Num_Lock<Key>KP_Decimal: string(.)\n\
++ @Num_Lock<Key>KP_Divide: string(/)\n\
++ @Num_Lock<Key>KP_Enter: string(\015)\n\
++ @Num_Lock<Key>KP_Equal: string(=)\n\
++ @Num_Lock<Key>KP_Multiply: string(*)\n\
++ @Num_Lock<Key>KP_Subtract: string(-)\n\
++ <Key>KP_Add: string(+)\n\
++ <Key>KP_Divide: string(/)\n\
++ <Key>KP_Enter: string(\015)\n\
++ <Key>KP_Equal: string(=)\n\
++ <Key>KP_Multiply: string(*)\n\
++ <Key>KP_Subtract: string(-)\n\
++ Shift<Key>KP_Home: scroll-back(100,page)\n\
++ Shift<Key>KP_End: scroll-forw(100,page)\n\
++ Shift<Key>Prior:scroll-back(1,page)\n\
++ Shift<Key>Next:scroll-forw(1,page)\n\
++ <Key>F16: start-extend() select-end(PRIMARY, CUT_BUFFER0, CLIPBOARD)\n\
++ <Key>F18: insert-selection(PRIMARY, CLIPBOARD)\n\
++ <Key>F27: scroll-back(100,page)\n\
++ <Key>R13: scroll-forw(100,page)\n\
++ Ctrl<Key>Home: string(0x1b) string("[1;5H")\n\
++ Shift<Key>Home: string(0x1b) string("[1;2H")\n\
++ Ctrl<Key>End: string(0x1b) string("[1;5F")\n\
++ Shift<Key>End: string(0x1b) string("[1;2F")\n\
++ Ctrl<Key>Insert: string(0x1b) string("[2;5~")\n\
++ Shift<Key>Insert: string(0x1b) string("[2;2~")\n\
++ ~Meta<Key>Insert: string(0x1b) string("[2~")\n\
++ Meta<Key>Insert: string(0x1b) string(0x1b) string("[2~")\n\
++ Ctrl<Key>Delete: string(0x1b) string("[3;5~")\n\
++ Shift<Key>Delete: string(0x1b) string("[3;2~")\n\
++ ~Meta<Key>Delete: string(0x1b) string("[3~")\n\
++ Meta<Key>Delete: string(0x1b) string(0x1b) string("[3~")\n\
++ Ctrl<Key>Page_Up: string(0x1b) string("[5;5~")\n\
++ ~Meta<Key>Page_Up: string(0x1b) string("[5~")\n\
++ Meta<Key>Page_Up: string(0x1b) string(0x1b) string("[5~")\n\
++ Ctrl<Key>Page_Down: string(0x1b) string("[6;5~")\n\
++ ~Meta<Key>Page_Down: string(0x1b) string("[6~")\n\
++ Meta<Key>Page_Down: string(0x1b) string(0x1b) string("[6~")\n\
++ ~Meta<Key>BackSpace: string(0x08)\n\
++ Meta<Key>BackSpace: string(0x1b) string(0x08)\n\
++ Ctrl Shift<Key>Up: string(0x1b) string("[1;6A")\n\
++ Ctrl<Key>Up: string(0x1b) string("[1;5A")\n\
++ Shift<Key>Up: string(0x1b) string("O2A")\n\
++ ~Meta<Key>Up: string(0x1b) string("OA")\n\
++ Meta<Key>Up: string(0x1b) string(0x1b) string("OA")\n\
++ Ctrl Shift<Key>Down: string(0x1b) string("[1;6B")\n\
++ Ctrl<Key>Down: string(0x1b) string("[1;5B")\n\
++ Shift<Key>Down: string(0x1b) string("O2B")\n\
++ ~Meta<Key>Down: string(0x1b) string("OB")\n\
++ Meta<Key>Down: string(0x1b) string(0x1b) string("OB")\n\
++ Ctrl Shift<Key>Left: string(0x1b) string("[1;6D")\n\
++ Ctrl<Key>Left: string(0x1b) string("[1;5D")\n\
++ Shift<Key>Left: string(0x1b) string("O2D")\n\
++ Mod5<Key>Left: string(0x1b) string("b")\n\
++ ~Meta<Key>Left: string(0x1b) string("OD")\n\
++ Meta<Key>Left: string(0x1b) string(0x1b) string("OD")\n\
++ Ctrl Shift<Key>Right: string(0x1b) string("[1;6C")\n\
++ Ctrl<Key>Right: string(0x1b) string("[1;5C")\n\
++ Shift<Key>Right: string(0x1b) string("O2C")\n\
++ Mod5<Key>Right: string(0x1b) string("f")\n\
++ ~Meta<Key>Right: string(0x1b) string("OC")\n\
++ Meta<Key>Right: string(0x1b) string(0x1b) string("OC")\n\
++ ~Meta<Key>Return: string(0x0d)\n\
++ Meta<Key>Return: string(0x1b) string(0x0d)\n\
++ Ctrl<Key>Tab: string(0x1b) string(0x09)\n\
++ Mod5<Key>Tab: string(0x1b) string(0x09)\n\
++ ~Meta<Key>Tab: string(0x09)\n\
++ Meta<Key>Tab: string(0x1b) string(0x09)\n\
++ ~s<Key>F1: string(0x1b) string("[11~")\n\
++ ~s<Key>F2: string(0x1b) string("[12~")\n\
++ ~s<Key>F3: string(0x1b) string("[13~")\n\
++ ~s<Key>F4: string(0x1b) string("[14~")\n\
++ ~s<Key>F5: string(0x1b) string("[15~")\n\
++ ~s<Key>F6: string(0x1b) string("[17~")\n\
++ ~s<Key>F7: string(0x1b) string("[18~")\n\
++ ~s<Key>F8: string(0x1b) string("[19~")\n\
++ ~s<Key>F9: string(0x1b) string("[20~")\n\
++ ~s<Key>F10: string(0x1b) string("[21~")\n\
++ <Key>F11: string(0x1b) string("[23~")\n\
++ <Key>F12: string(0x1b) string("[24~")\n\
++ <Key>F13: string(0x1b) string("[25~")\n\
++ <Key>F14: string(0x1b) string("[26~")\n\
++ <Key>F15: string(0x1b) string("[28~")\n\
++ <Key>F16: string(0x1b) string("[29~")\n\
++ <Key>F17: string(0x1b) string("[31~")\n\
++ <Key>F18: string(0x1b) string("[32~")\n\
++ <Key>F19: string(0x1b) string("[33~")\n\
++ <Key>F20: string(0x1b) string("[34~")\n\
++ s<Key>F1: string(0x1b) string("[23~")\n\
++ s<Key>F2: string(0x1b) string("[24~")\n\
++ s<Key>F3: string(0x1b) string("[25~")\n\
++ s<Key>F4: string(0x1b) string("[26~")\n\
++ s<Key>F5: string(0x1b) string("[28~")\n\
++ s<Key>F6: string(0x1b) string("[29~")\n\
++ s<Key>F7: string(0x1b) string("[31~")\n\
++ s<Key>F8: string(0x1b) string("[32~")\n\
++ s<Key>F9: string(0x1b) string("[33~")\n\
++ s<Key>F10: string(0x1b) string("[34~")\n\
++ a<Key>Return: string(0x1b) string(0x0d)\n\
++ a<Key>Tab: string(0x1b) string(0x09)\n\
++ a<Key>space: string(0x1b) string(" ")\n\
++ a s<Key>question: string(0x1b) string("?")\n\
++ a s<Key>exclam: string(0x1b) string("!")\n\
++ a <Key>period: string(0x1b) string(".")\n\
++ a<Key>`: string(0x1b) string("`")\n\
++ a<Key>1: string(0x1b) string("1")\n\
++ a<Key>2: string(0x1b) string("2")\n\
++ a<Key>3: string(0x1b) string("3")\n\
++ a<Key>4: string(0x1b) string("4")\n\
++ a<Key>5: string(0x1b) string("5")\n\
++ a<Key>6: string(0x1b) string("6")\n\
++ a<Key>7: string(0x1b) string("7")\n\
++ a<Key>8: string(0x1b) string("8")\n\
++ a<Key>9: string(0x1b) string("9")\n\
++ a<Key>0: string(0x1b) string("0")\n\
++ a<Key>a: string(0x1b) string("a")\n\
++ a<Key>b: string(0x1b) string("b")\n\
++ a<Key>c: string(0x1b) string("c")\n\
++ a<Key>d: string(0x1b) string("d")\n\
++ a<Key>e: string(0x1b) string("e")\n\
++ a<Key>f: string(0x1b) string("f")\n\
++ a<Key>g: string(0x1b) string("g")\n\
++ a s<Key>h: string(0x1b) string("H")\n\
++ a<Key>h: string(0x1b) string("h")\n\
++ a<Key>i: string(0x1b) string("i")\n\
++ a<Key>j: string(0x1b) string("j")\n\
++ a<Key>k: string(0x1b) string("k")\n\
++ a<Key>l: string(0x1b) string("l")\n\
++ a<Key>m: string(0x1b) string("m")\n\
++ a<Key>n: string(0x1b) string("n")\n\
++ a<Key>o: string(0x1b) string("o")\n\
++ a<Key>p: string(0x1b) string("p")\n\
++ a<Key>q: string(0x1b) string("q")\n\
++ a<Key>r: string(0x1b) string("r")\n\
++ a<Key>s: string(0x1b) string("s")\n\
++ a<Key>t: string(0x1b) string("t")\n\
++ a<Key>u: string(0x1b) string("u")\n\
++ a<Key>v: string(0x1b) string("v")\n\
++ a<Key>w: string(0x1b) string("w")\n\
++ a<Key>x: string(0x1b) string("x")\n\
++ a<Key>y: string(0x1b) string("y")\n\
++ a<Key>z: string(0x1b) string("z")
++
+ ! If xterm is built with a toolbar, the widget hierarchy looks like this,
+ ! showing widget name / class names. The complete menu hierarchy is built
+ ! at startup because it is needed to make the layout work for the menubar:
projects / packages / X11.git / blobdiff