Merge remote-tracking branch 'origin/released'

Conflicts:
	fontconfig/.gitignore
	libX11/src/ConvSel.c
	libX11/src/CrGlCur.c
	libX11/src/CrWindow.c
	libX11/src/GetDflt.c
	libX11/src/Window.c
	libX11/src/xlibi18n/XimProto.h
	libX11/src/xlibi18n/lcDynamic.c
	libxcb/src/.gitignore
	libxcb/src/xcb_ext.c
	libxcb/src/xcb_xid.c
	mesalib/src/glsl/.gitignore
	mesalib/src/glsl/glcpp/.gitignore
	mesalib/src/mapi/glapi/gen/glX_API.xml
	mesalib/src/mapi/glapi/glapi_getproc.c
	mesalib/src/mesa/main/.gitignore
	mesalib/src/mesa/main/syncobj.c
	mesalib/src/mesa/program/.gitignore
	xkbcomp/listing.c
	xkbcomp/xkbpath.c
	xorg-server/.gitignore
	xorg-server/Xext/xvmain.c
	xorg-server/dix/dispatch.c
	xorg-server/hw/xwin/glx/winpriv.h
	xorg-server/hw/xwin/winprefsyacc.y
	xorg-server/hw/xwin/winscrinit.c
	xorg-server/xkeyboard-config/rules/bin/ml1_s.sh
	xorg-server/xkeyboard-config/rules/bin/ml1v1_s.sh
	xorg-server/xkeyboard-config/rules/bin/ml1v_s.sh
	xorg-server/xkeyboard-config/rules/bin/ml_s.sh
	xorg-server/xkeyboard-config/rules/bin/mlv_s.sh
	xorg-server/xkeyboard-config/rules/compat/.gitignore

5 files changed, 679 insertions, 679 deletions

diff --git a/xorg-server/xkeyboard-config/symbols/digital_vndr/Makefile.am b/xorg-server/xkeyboard-config/symbols/digital_vndr/Makefile.am
index 063fc8d57..69184024b 100644
--- a/xorg-server/xkeyboard-config/symbols/digital_vndr/Makefile.am
+++ b/xorg-server/xkeyboard-config/symbols/digital_vndr/Makefile.am
@@ -1,5 +1,5 @@
-symbolsdir = $(xkb_base)/symbols/digital_vndr
-
-dist_symbols_DATA = \
-lk pc us \
-vt
+symbolsdir = $(xkb_base)/symbols/digital_vndr

+

+dist_symbols_DATA = \

+lk pc us \

+vt

diff --git a/xorg-server/xkeyboard-config/symbols/digital_vndr/lk b/xorg-server/xkeyboard-config/symbols/digital_vndr/lk
index 82a8c90c6..243086581 100644
--- a/xorg-server/xkeyboard-config/symbols/digital_vndr/lk
+++ b/xorg-server/xkeyboard-config/symbols/digital_vndr/lk
@@ -1,130 +1,130 @@
-//

-//Copyright (c) 1996  Digital Equipment Corporation

-//

-//Permission is hereby granted, free of charge, to any person obtaining

-//a copy of this software and associated documentation files (the

-//"Software"), to deal in the Software without restriction, including

-//without limitation the rights to use, copy, modify, merge, publish,

-//distribute, sublicense, and sell copies of the Software, and to

-//permit persons to whom the Software is furnished to do so, subject to

-//the following conditions:

-//

-//The above copyright notice and this permission notice shall be included

-//in all copies or substantial portions of the Software.

-//

-//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-//OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-//IN NO EVENT SHALL DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM,

-//DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR

-//OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR

-//THE USE OR OTHER DEALINGS IN THE SOFTWARE.

-//

-//Except as contained in this notice, the name of the Digital Equipment 

-//Corporation shall not be used in advertising or otherwise to promote

-//the sale, use or other dealings in this Software without prior written

-//authorization from Digital Equipment Corporation.

-//

-// HISTORY

-// Log: lk,v 

-// Revision 1.2  1996/06/18  09:10:09  erik

-// use flags correctly, assorted cleanups and consortium fixes

-//

-// Revision 1.1.2.2  1995/03/10  17:16:52  William_Walker

-// 	Rename to avoid name conflicts with XKB stuff

-// 	[1995/03/10  17:10:33  William_Walker]

-//

-// Revision 1.1.2.2  1994/10/31  15:22:00  William_Walker

-// 	New experimental version.

-// 	[1994/10/31  14:48:37  William_Walker]

-// 

-// EndLog

-// 

-// @(#)RCSfile: lk,v  Revision: 1.2  (DEC) Date: 1996/01/24 12:14:58

-// 

-// Symbols common to all the LK-style keyboards.

-//

-default xkb_symbols "common" {

-

-    // Modifier mappings

-    modifier_map Shift  	{ Shift_L, 	Shift_R	  };

-    modifier_map Lock   	{ Caps_Lock };

-    modifier_map Control	{ Control_L, Control_R };

-    modifier_map Mod1		{ Alt_L, Alt_R, Meta_L, Meta_R };

-    modifier_map Mod2		{ Num_Lock };

-    modifier_map Mod3   	{ Scroll_Lock };

-

-    // Additional alphanumeric keys

-    key <LSGT>		{ [ less,	greater		] };

-    key <LALT>		{ [ Alt_L,	Meta_L		] };

-

-    // "Function" keys

-    key <FK01>		{ [ F1				] };

-    key <FK02>		{ [ F2				] };

-    key <FK03>		{ [ F3				] };

-    key <FK04>		{ [ F4				] };

-    key <FK05>		{ [ F5				] };

-    key <FK06>		{ [ F6				] };

-    key <FK07>		{ [ F7				] };

-    key <FK08>		{ [ F8				] };

-    key <FK09>		{ [ F9				] };

-    key <FK10>		{ [ F10				] };

-    key <FK11>		{ [ Escape,	F11		] };

-    key <FK12>		{ [ F12				] };

-    key <FK13>		{ [ F13				] };

-    key <FK14>		{ [ F14				] };

-    key <FK17>		{ [ F17				] };

-    key <FK18>		{ [ F18				] };

-    key <FK19>		{ [ F19				] };

-    key <FK20>		{ [ F20				] };

-

-    // "Editing" keys

-    key <HELP>		{ [ Help			] };

-    key <DO>		{ [ Menu			] };

-    key <FIND>		{ [ Find			] };

-    key <INS>		{ [ Insert			] };

-    key <DELE>		{ [ Delete			] };

-    key <SELE>		{ [ Select			] };

-    key <PGUP>		{ [ Prior			] };

-    key <PGDN>		{ [ Next			] };

-

-    key <UP>		{ [ Up				] };

-    key <LEFT>		{ [ Left			] };

-    key <DOWN>		{ [ Down			] };

-    key <RGHT>		{ [ Right			] };

-

-    // "Keypad" keys

-    key <KPF1>		{

-				type= "SHIFT+ALT",

-				symbols[Group1]=[ KP_F1,Pointer_EnableKeys ]

-			};

-    key <KPF2>		{ [ KP_F2			] };

-    key <KPF3>		{ [ KP_F3			] };

-    key <KPF4>		{ [ KP_F4			] };

-

-    key <KPCO>		{ [ KP_Separator		] };

-    key <KPSU>		{ [ KP_Subtract			] };

-

-    key <KP7>		{ [ KP_7			] };

-    key <KP8>		{ [ KP_8			] };

-    key <KP9>		{ [ KP_9			] };

-

-    key <KP4>		{ [ KP_4			] };

-    key <KP5>		{ [ KP_5			] };

-    key <KP6>		{ [ KP_6			] };

-

-    key <KP1>		{ [ KP_1			] };

-    key <KP2>		{ [ KP_2			] };

-    key <KP3>		{ [ KP_3			] };

-    key <KPEN>		{ [ KP_Enter			] };

-

-    key <KP0>		{ [ KP_0			] };

-    key <KPDL>		{ [ KP_Decimal			] };

-};

-

-xkb_symbols "lk401" {

-    include "symbols/digital_vndr/lk(common)"

-    key <RALT>              { [ Alt_R,      Meta_R          ] };

-    key <LCMP>              { [ Multi_key                   ] };

-    key <RCMP>              { [ Multi_key                   ] };

-};

+//
+//Copyright (c) 1996  Digital Equipment Corporation
+//
+//Permission is hereby granted, free of charge, to any person obtaining
+//a copy of this software and associated documentation files (the
+//"Software"), to deal in the Software without restriction, including
+//without limitation the rights to use, copy, modify, merge, publish,
+//distribute, sublicense, and sell copies of the Software, and to
+//permit persons to whom the Software is furnished to do so, subject to
+//the following conditions:
+//
+//The above copyright notice and this permission notice shall be included
+//in all copies or substantial portions of the Software.
+//
+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+//OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+//IN NO EVENT SHALL DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM,
+//DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+//OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
+//THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+//Except as contained in this notice, the name of the Digital Equipment 
+//Corporation shall not be used in advertising or otherwise to promote
+//the sale, use or other dealings in this Software without prior written
+//authorization from Digital Equipment Corporation.
+//
+// HISTORY
+// Log: lk,v 
+// Revision 1.2  1996/06/18  09:10:09  erik
+// use flags correctly, assorted cleanups and consortium fixes
+//
+// Revision 1.1.2.2  1995/03/10  17:16:52  William_Walker
+// 	Rename to avoid name conflicts with XKB stuff
+// 	[1995/03/10  17:10:33  William_Walker]
+//
+// Revision 1.1.2.2  1994/10/31  15:22:00  William_Walker
+// 	New experimental version.
+// 	[1994/10/31  14:48:37  William_Walker]
+// 
+// EndLog
+// 
+// @(#)RCSfile: lk,v  Revision: 1.2  (DEC) Date: 1996/01/24 12:14:58
+// 
+// Symbols common to all the LK-style keyboards.
+//
+default xkb_symbols "common" {
+
+    // Modifier mappings
+    modifier_map Shift  	{ Shift_L, 	Shift_R	  };
+    modifier_map Lock   	{ Caps_Lock };
+    modifier_map Control	{ Control_L, Control_R };
+    modifier_map Mod1		{ Alt_L, Alt_R, Meta_L, Meta_R };
+    modifier_map Mod2		{ Num_Lock };
+    modifier_map Mod3   	{ Scroll_Lock };
+
+    // Additional alphanumeric keys
+    key <LSGT>		{ [ less,	greater		] };
+    key <LALT>		{ [ Alt_L,	Meta_L		] };
+
+    // "Function" keys
+    key <FK01>		{ [ F1				] };
+    key <FK02>		{ [ F2				] };
+    key <FK03>		{ [ F3				] };
+    key <FK04>		{ [ F4				] };
+    key <FK05>		{ [ F5				] };
+    key <FK06>		{ [ F6				] };
+    key <FK07>		{ [ F7				] };
+    key <FK08>		{ [ F8				] };
+    key <FK09>		{ [ F9				] };
+    key <FK10>		{ [ F10				] };
+    key <FK11>		{ [ Escape,	F11		] };
+    key <FK12>		{ [ F12				] };
+    key <FK13>		{ [ F13				] };
+    key <FK14>		{ [ F14				] };
+    key <FK17>		{ [ F17				] };
+    key <FK18>		{ [ F18				] };
+    key <FK19>		{ [ F19				] };
+    key <FK20>		{ [ F20				] };
+
+    // "Editing" keys
+    key <HELP>		{ [ Help			] };
+    key <DO>		{ [ Menu			] };
+    key <FIND>		{ [ Find			] };
+    key <INS>		{ [ Insert			] };
+    key <DELE>		{ [ Delete			] };
+    key <SELE>		{ [ Select			] };
+    key <PGUP>		{ [ Prior			] };
+    key <PGDN>		{ [ Next			] };
+
+    key <UP>		{ [ Up				] };
+    key <LEFT>		{ [ Left			] };
+    key <DOWN>		{ [ Down			] };
+    key <RGHT>		{ [ Right			] };
+
+    // "Keypad" keys
+    key <KPF1>		{
+				type= "SHIFT+ALT",
+				symbols[Group1]=[ KP_F1,Pointer_EnableKeys ]
+			};
+    key <KPF2>		{ [ KP_F2			] };
+    key <KPF3>		{ [ KP_F3			] };
+    key <KPF4>		{ [ KP_F4			] };
+
+    key <KPCO>		{ [ KP_Separator		] };
+    key <KPSU>		{ [ KP_Subtract			] };
+
+    key <KP7>		{ [ KP_7			] };
+    key <KP8>		{ [ KP_8			] };
+    key <KP9>		{ [ KP_9			] };
+
+    key <KP4>		{ [ KP_4			] };
+    key <KP5>		{ [ KP_5			] };
+    key <KP6>		{ [ KP_6			] };
+
+    key <KP1>		{ [ KP_1			] };
+    key <KP2>		{ [ KP_2			] };
+    key <KP3>		{ [ KP_3			] };
+    key <KPEN>		{ [ KP_Enter			] };
+
+    key <KP0>		{ [ KP_0			] };
+    key <KPDL>		{ [ KP_Decimal			] };
+};
+
+xkb_symbols "lk401" {
+    include "symbols/digital_vndr/lk(common)"
+    key <RALT>              { [ Alt_R,      Meta_R          ] };
+    key <LCMP>              { [ Multi_key                   ] };
+    key <RCMP>              { [ Multi_key                   ] };
+};
diff --git a/xorg-server/xkeyboard-config/symbols/digital_vndr/pc b/xorg-server/xkeyboard-config/symbols/digital_vndr/pc
index b8d1fb2bb..f50d4cde4 100644
--- a/xorg-server/xkeyboard-config/symbols/digital_vndr/pc
+++ b/xorg-server/xkeyboard-config/symbols/digital_vndr/pc
@@ -1,175 +1,175 @@
-//

-//Copyright (c) 1996  Digital Equipment Corporation

-//

-//Permission is hereby granted, free of charge, to any person obtaining

-//a copy of this software and associated documentation files (the

-//"Software"), to deal in the Software without restriction, including

-//without limitation the rights to use, copy, modify, merge, publish,

-//distribute, sublicense, and sell copies of the Software, and to

-//permit persons to whom the Software is furnished to do so, subject to

-//the following conditions:

-//

-//The above copyright notice and this permission notice shall be included

-//in all copies or substantial portions of the Software.

-//

-//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-//OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-//IN NO EVENT SHALL DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM,

-//DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR

-//OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR

-//THE USE OR OTHER DEALINGS IN THE SOFTWARE.

-//

-//Except as contained in this notice, the name of the Digital Equipment 

-//Corporation shall not be used in advertising or otherwise to promote

-//the sale, use or other dealings in this Software without prior written

-//authorization from Digital Equipment Corporation.

-//

-// HISTORY

-// Log

-// Revision 1.2  1996/06/18  09:10:12  erik

-// use flags correctly, assorted cleanups and consortium fixes

-//

-// Revision 1.1.6.4  1995/12/19  19:55:58  William_Walker

-// 	Update to XKB 0.65

-// 	[1995/12/17  02:37:07  William_Walker]

-//

-// Revision 1.1.6.3  1995/10/25  21:01:09  William_Walker

-// 	Make sure we use DIN 2137 and VT510 Spec for Group Semantics

-// 	[1995/10/23  15:49:03  William_Walker]

-// 

-// Revision 1.1.6.2  1995/08/07  17:40:40  William_Walker

-// 	Upgrade XKB to protocol 0.62 (dual submit from decx11)

-// 	[1995/08/06  14:06:32  William_Walker]

-// 

-// Revision 1.1.2.7  1995/08/05  15:25:57  William_Walker

-// 	Sync up with Erik's pool.

-// 	[1995/08/03  20:17:15  William_Walker]

-// 

-// Revision 1.1.2.6  1995/06/27  12:18:25  William_Walker

-// 	Add LK201 and LK450 support as well as TW and DP variants.

-// 	[1995/06/26  20:29:52  William_Walker]

-// 

-// Revision 1.1.2.5  1995/06/08	 17:10:28  William_Walker

-// 	Make RALT default to Mode_switch

-// 	[1995/06/08  17:08:50  William_Walker]

-// 

-// Revision 1.1.2.4  1995/06/05	 19:24:14  William_Walker

-// 	New file.  I love keymaps.

-// 	[1995/06/05  18:17:03  William_Walker]

-// 

-// EndLog

-// 

-// @(#)RCSfile: pc  Revision: /main/4  (DEC) Date: 1996/01/24 12:15:02 

-// 

-

-// **************************************************************

-// *								*

-// * The symbols common to all Extended PC layouts.		*

-// *								*

-// **************************************************************

-xkb_symbols "pc" {

-

-    // Modifier mappings

-    //

-    modifier_map Shift		{ Shift_L, Shift_R		};

-    modifier_map Lock		{ Caps_Lock			};

-    modifier_map Control	{ Control_L, Control_R		};

-    modifier_map Mod1		{ Alt_L, Alt_R, Meta_L, Meta_R	};

-    modifier_map Mod3		{ Mode_switch			};

-    modifier_map Mod4		{ Num_Lock			};

-    modifier_map Mod5		{ Scroll_Lock			};

-

-    // Common keys

-    //

-    key <BKSP> {       [       BackSpace,	   Delete ] };

-    key	 <TAB> {       [	     Tab,    ISO_Left_Tab ] };

-    key <CAPS> {       [       Caps_Lock ] };

-    key <RTRN> {       [	  Return ] };

-    key <LFSH> {       [	 Shift_L ] };

-    key <RTSH> {       [	 Shift_R ] };

-    key <LCTL> {       [       Control_L ] };

-    key <LALT> {       [	   Alt_L,	   Meta_L ] };

-    key <SPCE> {       [	   space ] };

-    key <RALT> {       [     Mode_switch ] };

-    key <RCTL> {       [       Control_R ] };

-

-    // "Function" keys

-    //

-    key	 <ESC> {       [	  Escape ] };

-    key <FK01> {       [	      F1 ] };

-    key <FK02> {       [	      F2 ] };

-    key <FK03> {       [	      F3 ] };

-    key <FK04> {       [	      F4 ] };

-    key <FK05> {       [	      F5 ] };

-    key <FK06> {       [	      F6 ] };

-    key <FK07> {       [	      F7 ] };

-    key <FK08> {       [	      F8 ] };

-    key <FK09> {       [	      F9 ] };

-    key <FK10> {       [	     F10 ] };

-    key <FK11> {       [	     F11 ] };

-    key <FK12> {       [	     F12 ] };

-    key <PRSC> {

-	type= "PC_ALT_LEVEL2",

-	symbols[Group1]= [	     Print,	    Sys_Req ]

-    };

-    key <SCLK> {       [     Scroll_Lock ] };

-    key <PAUS> {

-	type= "PC_CONTROL_LEVEL2",

-	symbols[Group1]= [	     Pause,	      Break ]

-    };

-

-    // "Editing" keys

-    //

-    key	 <INS> {       [	  Insert ] };

-    key <HOME> {       [	    Home ] };

-    key <PGUP> {       [	   Prior ] };

-    key <DELE> {       [	  Delete ] };

-    key	 <END> {       [	     End ] };

-    key <PGDN> {       [	    Next ] };

-

-    key	  <UP> {       [	      Up ] };

-    key <LEFT> {       [	    Left ] };

-    key <DOWN> {       [	    Down ] };

-    key <RGHT> {       [	   Right ] };

-

-    // "Keypad" keys

-    //

-    key <NMLK> {

-	type= "SHIFT+ALT",

-	symbols[Group1]= [	  Num_Lock,Pointer_EnableKeys]

-    };

-    key <KPDV> {       [       KP_Divide ] };

-    key <KPMU> {       [     KP_Multiply ] };

-    key <KPSU> {       [     KP_Subtract ] };

-

-    key	 <KP7> {       [	 KP_Home,	     KP_7 ] };

-    key	 <KP8> {       [	   KP_Up,	     KP_8 ] };

-    key	 <KP9> {       [	KP_Prior,	     KP_9 ] };

-    key <KPAD> {       [	  KP_Add ] };

-

-    key	 <KP4> {       [	 KP_Left,	     KP_4 ] };

-    key	 <KP5> {       [	    KP_5 ] };

-    key	 <KP6> {       [	KP_Right,	     KP_6 ] };

-

-    key	 <KP1> {       [	  KP_End,	     KP_1 ] };

-    key	 <KP2> {       [	 KP_Down,	     KP_2 ] };

-    key	 <KP3> {       [	 KP_Next,	     KP_3 ] };

-    key <KPEN> {       [	KP_Enter ] };

-

-    key	 <KP0> {       [       KP_Insert,	     KP_0 ] };

-    key <KPDL> {       [       KP_Delete,      KP_Decimal ] };

-

-    // Key to support Lock-Down Modifier descriptions for R5

-    //

-    key	 <LDM> {       [	NoSymbol ] };

-};

-

-xkb_symbols "pc104" {

-    include "digital_vndr/pc(pc)"

-

-    replace key <LALT> {       [       Alt_L ] };

-    key	<LWIN> {       [	 Meta_L ] };

-    key	<RWIN> {       [	 Meta_R ] };

-    key	<MENU> {       [	 Menu   ] };

-};

+//
+//Copyright (c) 1996  Digital Equipment Corporation
+//
+//Permission is hereby granted, free of charge, to any person obtaining
+//a copy of this software and associated documentation files (the
+//"Software"), to deal in the Software without restriction, including
+//without limitation the rights to use, copy, modify, merge, publish,
+//distribute, sublicense, and sell copies of the Software, and to
+//permit persons to whom the Software is furnished to do so, subject to
+//the following conditions:
+//
+//The above copyright notice and this permission notice shall be included
+//in all copies or substantial portions of the Software.
+//
+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+//OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+//IN NO EVENT SHALL DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM,
+//DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+//OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
+//THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+//Except as contained in this notice, the name of the Digital Equipment 
+//Corporation shall not be used in advertising or otherwise to promote
+//the sale, use or other dealings in this Software without prior written
+//authorization from Digital Equipment Corporation.
+//
+// HISTORY
+// Log
+// Revision 1.2  1996/06/18  09:10:12  erik
+// use flags correctly, assorted cleanups and consortium fixes
+//
+// Revision 1.1.6.4  1995/12/19  19:55:58  William_Walker
+// 	Update to XKB 0.65
+// 	[1995/12/17  02:37:07  William_Walker]
+//
+// Revision 1.1.6.3  1995/10/25  21:01:09  William_Walker
+// 	Make sure we use DIN 2137 and VT510 Spec for Group Semantics
+// 	[1995/10/23  15:49:03  William_Walker]
+// 
+// Revision 1.1.6.2  1995/08/07  17:40:40  William_Walker
+// 	Upgrade XKB to protocol 0.62 (dual submit from decx11)
+// 	[1995/08/06  14:06:32  William_Walker]
+// 
+// Revision 1.1.2.7  1995/08/05  15:25:57  William_Walker
+// 	Sync up with Erik's pool.
+// 	[1995/08/03  20:17:15  William_Walker]
+// 
+// Revision 1.1.2.6  1995/06/27  12:18:25  William_Walker
+// 	Add LK201 and LK450 support as well as TW and DP variants.
+// 	[1995/06/26  20:29:52  William_Walker]
+// 
+// Revision 1.1.2.5  1995/06/08	 17:10:28  William_Walker
+// 	Make RALT default to Mode_switch
+// 	[1995/06/08  17:08:50  William_Walker]
+// 
+// Revision 1.1.2.4  1995/06/05	 19:24:14  William_Walker
+// 	New file.  I love keymaps.
+// 	[1995/06/05  18:17:03  William_Walker]
+// 
+// EndLog
+// 
+// @(#)RCSfile: pc  Revision: /main/4  (DEC) Date: 1996/01/24 12:15:02 
+// 
+
+// **************************************************************
+// *								*
+// * The symbols common to all Extended PC layouts.		*
+// *								*
+// **************************************************************
+xkb_symbols "pc" {
+
+    // Modifier mappings
+    //
+    modifier_map Shift		{ Shift_L, Shift_R		};
+    modifier_map Lock		{ Caps_Lock			};
+    modifier_map Control	{ Control_L, Control_R		};
+    modifier_map Mod1		{ Alt_L, Alt_R, Meta_L, Meta_R	};
+    modifier_map Mod3		{ Mode_switch			};
+    modifier_map Mod4		{ Num_Lock			};
+    modifier_map Mod5		{ Scroll_Lock			};
+
+    // Common keys
+    //
+    key <BKSP> {       [       BackSpace,	   Delete ] };
+    key	 <TAB> {       [	     Tab,    ISO_Left_Tab ] };
+    key <CAPS> {       [       Caps_Lock ] };
+    key <RTRN> {       [	  Return ] };
+    key <LFSH> {       [	 Shift_L ] };
+    key <RTSH> {       [	 Shift_R ] };
+    key <LCTL> {       [       Control_L ] };
+    key <LALT> {       [	   Alt_L,	   Meta_L ] };
+    key <SPCE> {       [	   space ] };
+    key <RALT> {       [     Mode_switch ] };
+    key <RCTL> {       [       Control_R ] };
+
+    // "Function" keys
+    //
+    key	 <ESC> {       [	  Escape ] };
+    key <FK01> {       [	      F1 ] };
+    key <FK02> {       [	      F2 ] };
+    key <FK03> {       [	      F3 ] };
+    key <FK04> {       [	      F4 ] };
+    key <FK05> {       [	      F5 ] };
+    key <FK06> {       [	      F6 ] };
+    key <FK07> {       [	      F7 ] };
+    key <FK08> {       [	      F8 ] };
+    key <FK09> {       [	      F9 ] };
+    key <FK10> {       [	     F10 ] };
+    key <FK11> {       [	     F11 ] };
+    key <FK12> {       [	     F12 ] };
+    key <PRSC> {
+	type= "PC_ALT_LEVEL2",
+	symbols[Group1]= [	     Print,	    Sys_Req ]
+    };
+    key <SCLK> {       [     Scroll_Lock ] };
+    key <PAUS> {
+	type= "PC_CONTROL_LEVEL2",
+	symbols[Group1]= [	     Pause,	      Break ]
+    };
+
+    // "Editing" keys
+    //
+    key	 <INS> {       [	  Insert ] };
+    key <HOME> {       [	    Home ] };
+    key <PGUP> {       [	   Prior ] };
+    key <DELE> {       [	  Delete ] };
+    key	 <END> {       [	     End ] };
+    key <PGDN> {       [	    Next ] };
+
+    key	  <UP> {       [	      Up ] };
+    key <LEFT> {       [	    Left ] };
+    key <DOWN> {       [	    Down ] };
+    key <RGHT> {       [	   Right ] };
+
+    // "Keypad" keys
+    //
+    key <NMLK> {
+	type= "SHIFT+ALT",
+	symbols[Group1]= [	  Num_Lock,Pointer_EnableKeys]
+    };
+    key <KPDV> {       [       KP_Divide ] };
+    key <KPMU> {       [     KP_Multiply ] };
+    key <KPSU> {       [     KP_Subtract ] };
+
+    key	 <KP7> {       [	 KP_Home,	     KP_7 ] };
+    key	 <KP8> {       [	   KP_Up,	     KP_8 ] };
+    key	 <KP9> {       [	KP_Prior,	     KP_9 ] };
+    key <KPAD> {       [	  KP_Add ] };
+
+    key	 <KP4> {       [	 KP_Left,	     KP_4 ] };
+    key	 <KP5> {       [	    KP_5 ] };
+    key	 <KP6> {       [	KP_Right,	     KP_6 ] };
+
+    key	 <KP1> {       [	  KP_End,	     KP_1 ] };
+    key	 <KP2> {       [	 KP_Down,	     KP_2 ] };
+    key	 <KP3> {       [	 KP_Next,	     KP_3 ] };
+    key <KPEN> {       [	KP_Enter ] };
+
+    key	 <KP0> {       [       KP_Insert,	     KP_0 ] };
+    key <KPDL> {       [       KP_Delete,      KP_Decimal ] };
+
+    // Key to support Lock-Down Modifier descriptions for R5
+    //
+    key	 <LDM> {       [	NoSymbol ] };
+};
+
+xkb_symbols "pc104" {
+    include "digital_vndr/pc(pc)"
+
+    replace key <LALT> {       [       Alt_L ] };
+    key	<LWIN> {       [	 Meta_L ] };
+    key	<RWIN> {       [	 Meta_R ] };
+    key	<MENU> {       [	 Menu   ] };
+};
diff --git a/xorg-server/xkeyboard-config/symbols/digital_vndr/us b/xorg-server/xkeyboard-config/symbols/digital_vndr/us
index 95d7301e7..e737e4e3f 100644
--- a/xorg-server/xkeyboard-config/symbols/digital_vndr/us
+++ b/xorg-server/xkeyboard-config/symbols/digital_vndr/us
@@ -1,211 +1,211 @@
-//

-//Copyright (c) 1996  Digital Equipment Corporation

-//

-//Permission is hereby granted, free of charge, to any person obtaining

-//a copy of this software and associated documentation files (the

-//"Software"), to deal in the Software without restriction, including

-//without limitation the rights to use, copy, modify, merge, publish,

-//distribute, sublicense, and sell copies of the Software, and to

-//permit persons to whom the Software is furnished to do so, subject to

-//the following conditions:

-//

-//The above copyright notice and this permission notice shall be included

-//in all copies or substantial portions of the Software.

-//

-//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-//OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-//IN NO EVENT SHALL DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM,

-//DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR

-//OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR

-//THE USE OR OTHER DEALINGS IN THE SOFTWARE.

-//

-//Except as contained in this notice, the name of the Digital Equipment 

-//Corporation shall not be used in advertising or otherwise to promote

-//the sale, use or other dealings in this Software without prior written

-//authorization from Digital Equipment Corporation.

-//

-// HISTORY

-// Log

-// Revision 1.2  1996/06/18  09:10:16  erik

-// use flags correctly, assorted cleanups and consortium fixes

-//

-// Revision 1.1.6.3  1995/12/19  19:56:37  William_Walker

-// 	Update to XKB 0.65

-// 	[1995/12/17  02:37:44  William_Walker]

-//

-// Revision 1.1.6.2  1995/10/25  21:01:25  William_Walker

-// 	Add pc104-key support

-// 	[1995/10/23  15:46:27  William_Walker]

-// 

-// Revision 1.1.2.7  1995/06/27  12:18:40  William_Walker

-// 	Add LK201 and LK450 support as well as TW and DP variants.

-// 	[1995/06/26  20:30:33  William_Walker]

-// 

-// Revision 1.1.2.6  1995/06/09	 20:55:20  William_Walker

-// 	Add VT105 layout support and ISO group support

-// 	[1995/06/09  20:43:05  William_Walker]

-// 

-// Revision 1.1.2.5  1995/06/08	 21:05:49  William_Walker

-// 	Use ISO_Next_Group instead of grouplock

-// 	[1995/06/08  21:03:56  William_Walker]

-// 

-// Revision 1.1.2.4  1995/06/05	 19:25:00  William_Walker

-// 	New file.  I love keymaps.

-// 	[1995/06/05  18:17:54  William_Walker]

-// 

-// EndLog

-// 

-// @(#)RCSfile: us  Revision: /main/4  (DEC) Date: 1996/01/24 12:15:05 

-// 

-

-// **************************************************************

-// *								*

-// * Symbols for en_US.ISO8859-1 - English for U.S.		*

-// *								*

-// **************************************************************

-

-xkb_symbols "us" {

-

-    key <AE00> {       [	    grave,     asciitilde ] };

-    key <AE01> {       [		1,	   exclam ] };

-    key <AE02> {       [		2,	       at ] };

-    key <AE03> {       [		3,     numbersign ] };

-    key <AE04> {       [		4,	   dollar ] };

-    key <AE05> {       [		5,	  percent ] };

-    key <AE06> {       [		6,    asciicircum ] };

-    key <AE07> {       [		7,	ampersand ] };

-    key <AE08> {       [		8,	 asterisk ] };

-    key <AE09> {       [		9,	parenleft ] };

-    key <AE10> {       [		0,     parenright ] };

-    key <AE11> {       [	    minus,     underscore ] };

-    key <AE12> {       [	    equal,	     plus ] };

-

-    key <AD01> {       [		q,		Q ] };

-    key <AD02> {       [		w,		W ] };

-    key <AD03> {       [		e,		E ] };

-    key <AD04> {       [		r,		R ] };

-    key <AD05> {       [		t,		T ] };

-    key <AD06> {       [		y,		Y ] };

-    key <AD07> {       [		u,		U ] };

-    key <AD08> {       [		i,		I ] };

-    key <AD09> {       [		o,		O ] };

-    key <AD10> {       [		p,		P ] };

-    key <AD11> {       [      bracketleft,	braceleft ] };

-    key <AD12> {       [     bracketright,     braceright ] };

-

-    key <AC01> {       [		a,		A ] };

-    key <AC02> {       [		s,		S ] };

-    key <AC03> {       [		d,		D ] };

-    key <AC04> {       [		f,		F ] };

-    key <AC05> {       [		g,		G ] };

-    key <AC06> {       [		h,		H ] };

-    key <AC07> {       [		j,		J ] };

-    key <AC08> {       [		k,		K ] };

-    key <AC09> {       [		l,		L ] };

-    key <AC10> {       [	semicolon,	    colon ] };

-    key <AC11> {       [       apostrophe,	 quotedbl ] };

-    key <BKSL> {       [	backslash,	      bar ] };

-

-    key <AB01> {       [		z,		Z ] };

-    key <AB02> {       [		x,		X ] };

-    key <AB03> {       [		c,		C ] };

-    key <AB04> {       [		v,		V ] };

-    key <AB05> {       [		b,		B ] };

-    key <AB06> {       [		n,		N ] };

-    key <AB07> {       [		m,		M ] };

-    key <AB08> {       [	    comma,	     less ] };

-    key <AB09> {       [	   period,	  greater ] };

-    key <AB10> {       [	    slash,	 question ] };

-};

-

-// **************************************************************

-// *								*

-// * The VT105 layouts						*

-// *								*

-// * NOTES: The typewriter (TW) and dataprocessing (DP) keys	*

-// *	    for the VT108 layout are identical for the US.	*

-// *								*

-// **************************************************************

-xkb_symbols "vt105-tw" {

-    include "digital_vndr/us(us)"

-    include "digital_vndr/vt(vt105)"

-    override key <AE03> { 

-	symbols[Group1]= [ 3, numbersign ],

-	symbols[Group2]= [ sterling ]

-    };

-    key <AB00> {       [	     less,	  greater ] };

-};

-

-xkb_symbols "vt105-dp" { include "digital_vndr/us(vt105-tw)" };

-xkb_symbols "vt105"    { include "digital_vndr/us(vt105-tw)" };

-

-// **************************************************************

-// *								*

-// * The VT108 layouts - based upon the LK401-AA		*

-// *								*

-// * NOTES: The typewriter (TW) and dataprocessing (DP) keys	*

-// *	    for the VT108 layout are identical for the US.	*

-// *								*

-// **************************************************************

-xkb_symbols "vt108-tw" {

-    include "digital_vndr/us(us)"

-    include "digital_vndr/vt(vt108)"

-    replace key <LCMP> { [ Multi_key ] };

-    override key <AE03> { 

-	symbols[Group1]= [ 3, numbersign ],

-	symbols[Group2]= [ sterling ]

-    };

-    key <AB00> {       [	     less,	  greater ] };

-};

-

-xkb_symbols "vt108-dp" { include "digital_vndr/us(vt108-tw)" };

-xkb_symbols "vt108"    { include "digital_vndr/us(vt108-tw)" };

-

-// **************************************************************

-// *								*

-// * The "unix" layouts	- based upon the LK421-AA		*

-// *								*

-// * NOTES: The "unix" keyboard emits the same keycodes as the	*

-// *	    LK401, but is a shorter keyboard that uses an	*

-// *	    "extend" key.  To make life easier, we map <AE00>	*

-// *	    to Escape so users do not have to press Extend+F11	*

-// *	    to get Escape.					*

-// *								*

-// **************************************************************

-xkb_symbols "unix" {

-    include "digital_vndr/us(vt108)"

-    override key <AE00>	{ [ Escape ] };

-    override key <AB00>	{ [ grave, asciitilde ] };

-};

-

-// **************************************************************

-// *								*

-// * The "pcxal" layouts					*

-// *								*

-// * NOTES: The pcxal layouts are pretty much standardized for	*

-// *	    the US and use a 101-key keyboard.			*

-// *								*

-// **************************************************************

-xkb_symbols "pcxalga" {

-    include "digital_vndr/pc(pc)"

-    include "digital_vndr/us(us)"

-    replace key <RALT> { [ Alt_R, Meta_R ] };

-};

-

-xkb_symbols "pcxal"   { include "digital_vndr/us(pcxalga)" };

-xkb_symbols "pcxalaa" { include "digital_vndr/us(pcxalga)" };

-xkb_symbols "pcxalfa" { include "digital_vndr/us(pcxalga)" };

-xkb_symbols "pcxalka" { include "digital_vndr/us(pcxalga)" };

-xkb_symbols "lk44x"   { include "digital_vndr/us(pcxalga)" };

-

-// **************************************************************

-// *								*

-// * The "pc104" layouts.					*

-// *								*

-// **************************************************************

-xkb_symbols "pc104" {

-    include "digital_vndr/pc(pc104)"

-    include "digital_vndr/us(us)"

-    replace key <RALT> { [ Alt_R ] };

-};

+//
+//Copyright (c) 1996  Digital Equipment Corporation
+//
+//Permission is hereby granted, free of charge, to any person obtaining
+//a copy of this software and associated documentation files (the
+//"Software"), to deal in the Software without restriction, including
+//without limitation the rights to use, copy, modify, merge, publish,
+//distribute, sublicense, and sell copies of the Software, and to
+//permit persons to whom the Software is furnished to do so, subject to
+//the following conditions:
+//
+//The above copyright notice and this permission notice shall be included
+//in all copies or substantial portions of the Software.
+//
+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+//OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+//IN NO EVENT SHALL DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM,
+//DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+//OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
+//THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+//Except as contained in this notice, the name of the Digital Equipment 
+//Corporation shall not be used in advertising or otherwise to promote
+//the sale, use or other dealings in this Software without prior written
+//authorization from Digital Equipment Corporation.
+//
+// HISTORY
+// Log
+// Revision 1.2  1996/06/18  09:10:16  erik
+// use flags correctly, assorted cleanups and consortium fixes
+//
+// Revision 1.1.6.3  1995/12/19  19:56:37  William_Walker
+// 	Update to XKB 0.65
+// 	[1995/12/17  02:37:44  William_Walker]
+//
+// Revision 1.1.6.2  1995/10/25  21:01:25  William_Walker
+// 	Add pc104-key support
+// 	[1995/10/23  15:46:27  William_Walker]
+// 
+// Revision 1.1.2.7  1995/06/27  12:18:40  William_Walker
+// 	Add LK201 and LK450 support as well as TW and DP variants.
+// 	[1995/06/26  20:30:33  William_Walker]
+// 
+// Revision 1.1.2.6  1995/06/09	 20:55:20  William_Walker
+// 	Add VT105 layout support and ISO group support
+// 	[1995/06/09  20:43:05  William_Walker]
+// 
+// Revision 1.1.2.5  1995/06/08	 21:05:49  William_Walker
+// 	Use ISO_Next_Group instead of grouplock
+// 	[1995/06/08  21:03:56  William_Walker]
+// 
+// Revision 1.1.2.4  1995/06/05	 19:25:00  William_Walker
+// 	New file.  I love keymaps.
+// 	[1995/06/05  18:17:54  William_Walker]
+// 
+// EndLog
+// 
+// @(#)RCSfile: us  Revision: /main/4  (DEC) Date: 1996/01/24 12:15:05 
+// 
+
+// **************************************************************
+// *								*
+// * Symbols for en_US.ISO8859-1 - English for U.S.		*
+// *								*
+// **************************************************************
+
+xkb_symbols "us" {
+
+    key <AE00> {       [	    grave,     asciitilde ] };
+    key <AE01> {       [		1,	   exclam ] };
+    key <AE02> {       [		2,	       at ] };
+    key <AE03> {       [		3,     numbersign ] };
+    key <AE04> {       [		4,	   dollar ] };
+    key <AE05> {       [		5,	  percent ] };
+    key <AE06> {       [		6,    asciicircum ] };
+    key <AE07> {       [		7,	ampersand ] };
+    key <AE08> {       [		8,	 asterisk ] };
+    key <AE09> {       [		9,	parenleft ] };
+    key <AE10> {       [		0,     parenright ] };
+    key <AE11> {       [	    minus,     underscore ] };
+    key <AE12> {       [	    equal,	     plus ] };
+
+    key <AD01> {       [		q,		Q ] };
+    key <AD02> {       [		w,		W ] };
+    key <AD03> {       [		e,		E ] };
+    key <AD04> {       [		r,		R ] };
+    key <AD05> {       [		t,		T ] };
+    key <AD06> {       [		y,		Y ] };
+    key <AD07> {       [		u,		U ] };
+    key <AD08> {       [		i,		I ] };
+    key <AD09> {       [		o,		O ] };
+    key <AD10> {       [		p,		P ] };
+    key <AD11> {       [      bracketleft,	braceleft ] };
+    key <AD12> {       [     bracketright,     braceright ] };
+
+    key <AC01> {       [		a,		A ] };
+    key <AC02> {       [		s,		S ] };
+    key <AC03> {       [		d,		D ] };
+    key <AC04> {       [		f,		F ] };
+    key <AC05> {       [		g,		G ] };
+    key <AC06> {       [		h,		H ] };
+    key <AC07> {       [		j,		J ] };
+    key <AC08> {       [		k,		K ] };
+    key <AC09> {       [		l,		L ] };
+    key <AC10> {       [	semicolon,	    colon ] };
+    key <AC11> {       [       apostrophe,	 quotedbl ] };
+    key <BKSL> {       [	backslash,	      bar ] };
+
+    key <AB01> {       [		z,		Z ] };
+    key <AB02> {       [		x,		X ] };
+    key <AB03> {       [		c,		C ] };
+    key <AB04> {       [		v,		V ] };
+    key <AB05> {       [		b,		B ] };
+    key <AB06> {       [		n,		N ] };
+    key <AB07> {       [		m,		M ] };
+    key <AB08> {       [	    comma,	     less ] };
+    key <AB09> {       [	   period,	  greater ] };
+    key <AB10> {       [	    slash,	 question ] };
+};
+
+// **************************************************************
+// *								*
+// * The VT105 layouts						*
+// *								*
+// * NOTES: The typewriter (TW) and dataprocessing (DP) keys	*
+// *	    for the VT108 layout are identical for the US.	*
+// *								*
+// **************************************************************
+xkb_symbols "vt105-tw" {
+    include "digital_vndr/us(us)"
+    include "digital_vndr/vt(vt105)"
+    override key <AE03> { 
+	symbols[Group1]= [ 3, numbersign ],
+	symbols[Group2]= [ sterling ]
+    };
+    key <AB00> {       [	     less,	  greater ] };
+};
+
+xkb_symbols "vt105-dp" { include "digital_vndr/us(vt105-tw)" };
+xkb_symbols "vt105"    { include "digital_vndr/us(vt105-tw)" };
+
+// **************************************************************
+// *								*
+// * The VT108 layouts - based upon the LK401-AA		*
+// *								*
+// * NOTES: The typewriter (TW) and dataprocessing (DP) keys	*
+// *	    for the VT108 layout are identical for the US.	*
+// *								*
+// **************************************************************
+xkb_symbols "vt108-tw" {
+    include "digital_vndr/us(us)"
+    include "digital_vndr/vt(vt108)"
+    replace key <LCMP> { [ Multi_key ] };
+    override key <AE03> { 
+	symbols[Group1]= [ 3, numbersign ],
+	symbols[Group2]= [ sterling ]
+    };
+    key <AB00> {       [	     less,	  greater ] };
+};
+
+xkb_symbols "vt108-dp" { include "digital_vndr/us(vt108-tw)" };
+xkb_symbols "vt108"    { include "digital_vndr/us(vt108-tw)" };
+
+// **************************************************************
+// *								*
+// * The "unix" layouts	- based upon the LK421-AA		*
+// *								*
+// * NOTES: The "unix" keyboard emits the same keycodes as the	*
+// *	    LK401, but is a shorter keyboard that uses an	*
+// *	    "extend" key.  To make life easier, we map <AE00>	*
+// *	    to Escape so users do not have to press Extend+F11	*
+// *	    to get Escape.					*
+// *								*
+// **************************************************************
+xkb_symbols "unix" {
+    include "digital_vndr/us(vt108)"
+    override key <AE00>	{ [ Escape ] };
+    override key <AB00>	{ [ grave, asciitilde ] };
+};
+
+// **************************************************************
+// *								*
+// * The "pcxal" layouts					*
+// *								*
+// * NOTES: The pcxal layouts are pretty much standardized for	*
+// *	    the US and use a 101-key keyboard.			*
+// *								*
+// **************************************************************
+xkb_symbols "pcxalga" {
+    include "digital_vndr/pc(pc)"
+    include "digital_vndr/us(us)"
+    replace key <RALT> { [ Alt_R, Meta_R ] };
+};
+
+xkb_symbols "pcxal"   { include "digital_vndr/us(pcxalga)" };
+xkb_symbols "pcxalaa" { include "digital_vndr/us(pcxalga)" };
+xkb_symbols "pcxalfa" { include "digital_vndr/us(pcxalga)" };
+xkb_symbols "pcxalka" { include "digital_vndr/us(pcxalga)" };
+xkb_symbols "lk44x"   { include "digital_vndr/us(pcxalga)" };
+
+// **************************************************************
+// *								*
+// * The "pc104" layouts.					*
+// *								*
+// **************************************************************
+xkb_symbols "pc104" {
+    include "digital_vndr/pc(pc104)"
+    include "digital_vndr/us(us)"
+    replace key <RALT> { [ Alt_R ] };
+};
diff --git a/xorg-server/xkeyboard-config/symbols/digital_vndr/vt b/xorg-server/xkeyboard-config/symbols/digital_vndr/vt
index 5d3680db4..13f7941c6 100644
--- a/xorg-server/xkeyboard-config/symbols/digital_vndr/vt
+++ b/xorg-server/xkeyboard-config/symbols/digital_vndr/vt
@@ -1,158 +1,158 @@
-//

-//Copyright (c) 1996  Digital Equipment Corporation

-//

-//Permission is hereby granted, free of charge, to any person obtaining

-//a copy of this software and associated documentation files (the

-//"Software"), to deal in the Software without restriction, including

-//without limitation the rights to use, copy, modify, merge, publish,

-//distribute, sublicense, and sell copies of the Software, and to

-//permit persons to whom the Software is furnished to do so, subject to

-//the following conditions:

-//

-//The above copyright notice and this permission notice shall be included

-//in all copies or substantial portions of the Software.

-//

-//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-//OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-//IN NO EVENT SHALL DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM,

-//DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR

-//OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR

-//THE USE OR OTHER DEALINGS IN THE SOFTWARE.

-//

-//Except as contained in this notice, the name of the Digital Equipment 

-//Corporation shall not be used in advertising or otherwise to promote

-//the sale, use or other dealings in this Software without prior written

-//authorization from Digital Equipment Corporation.

-//

-// HISTORY

-// Log

-// Revision 1.2  1996/06/18  09:10:19  erik

-// use flags correctly, assorted cleanups and consortium fixes

-//

-// Revision 1.1.6.2  1995/12/19  19:56:39  William_Walker

-// 	Update to XKB 0.65

-// 	[1995/12/17  02:37:47  William_Walker]

-//

-// Revision 1.1.2.5  1995/07/11  21:20:50  William_Walker

-// 	Make RALT act as RALT

-// 	[1995/07/11  21:18:28  William_Walker]

-// 

-// Revision 1.1.2.4  1995/06/27  12:18:41  William_Walker

-// 	Add LK201 and LK450 support as well as TW and DP variants.

-// 	[1995/06/26  20:30:37  William_Walker]

-// 

-// Revision 1.1.2.3  1995/06/09	 20:55:21  William_Walker

-// 	Add VT105 layout support and ISO group support

-// 	[1995/06/09  20:43:09  William_Walker]

-// 

-// Revision 1.1.2.2  1995/06/05	 19:25:04  William_Walker

-// 	New file.  I love keymaps.

-// 	[1995/06/05  18:17:58  William_Walker]

-// 

-// EndLog

-// 

-// @(#)RCSfile: vt  Revision: /main/3  (DEC) Date: 1996/01/24 12:15:08 

-// 

-xkb_symbols "vt105" {

-

-    // Modifier mappings

-    //

-    modifier_map Shift		{ Shift_L, Shift_R		};

-    modifier_map Lock		{ Caps_Lock			};

-    modifier_map Control	{ Control_L, Control_R		};

-    modifier_map Mod1		{ Alt_L, Alt_R, Meta_L, Meta_R	};

-    modifier_map Mod3		{ Mode_switch			};

-

-    // Common keys

-    //

-    key <BKSP> {       [	  Delete ] };

-    key	 <TAB> {       [	     Tab ] };

-    key <RTRN> {       [	  Return ] };

-    key <LCTL> {       [       Control_L ] };

-    key <CAPS> {       [       Caps_Lock ] };

-    key <LFSH> {       [	 Shift_L ] };

-    key <RTSH> {       [	 Shift_R ] };

-    key <LCMP> {       [   Alt_L, Meta_L ] };

-    key <SPCE> {       [	   space ] };

-

-    // "Function" keys

-    //

-    key <FK01> {       [	       F1 ] };

-    key <FK02> {       [	       F2 ] };

-    key <FK03> {       [	       F3 ] };

-    key <FK04> {       [	       F4 ] };

-    key <FK05> {       [	       F5 ] };

-    key <FK06> {       [	       F6 ] };

-    key <FK07> {       [	       F7 ] };

-    key <FK08> {       [	       F8 ] };

-    key <FK09> {       [	       F9 ] };

-    key <FK10> {       [	      F10 ] };

-    key <FK11> {       [	   Escape,	      F11 ] };

-    key <FK12> {       [	      F12 ] };

-    key <FK13> {       [	      F13 ] };

-    key <FK14> {       [	      F14 ] };

-    key <FK17> {       [	      F17 ] };

-    key <FK18> {       [	      F18 ] };

-    key <FK19> {       [	      F19 ] };

-    key <FK20> {       [	      F20 ] };

-

-    // "Editing" keys

-    //

-    key <HELP> {       [	    Help ] };

-    key	  <DO> {       [	    Menu ] };

-    key <FIND> {       [	    Find ] };

-    key	 <INS> {       [	  Insert ] };

-    key <DELE> {       [       apLineDel ] };

-    key <SELE> {       [	  Select ] };

-    key <PGUP> {       [	   Prior ] };

-    key <PGDN> {       [	    Next ] };

-

-    key	  <UP> {       [	      Up ] };

-    key <LEFT> {       [	    Left ] };

-    key <DOWN> {       [	    Down ] };

-    key <RGHT> {       [	   Right ] };

-

-    // "Keypad" keys

-    //

-    key <KPF1> {

-	type= "SHIFT+ALT",

-	symbols[Group1]= [	     KP_F1,Pointer_EnableKeys ]

-    };

-    key <KPF2> {       [	   KP_F2 ] };

-    key <KPF3> {       [	   KP_F3 ] };

-    key <KPF4> {       [	   KP_F4 ] };

-

-    key	 <KP7> {       [	    KP_7 ] };

-    key	 <KP8> {       [	    KP_8 ] };

-    key	 <KP9> {       [	    KP_9 ] };

-    key <KPSU> {       [     KP_Subtract ] };

-

-    key	 <KP4> {       [	    KP_4 ] };

-    key	 <KP5> {       [	    KP_5 ] };

-    key	 <KP6> {       [	    KP_6 ] };

-    key <KPCO> {       [    KP_Separator ] };

-

-    key	 <KP1> {       [	    KP_1 ] };

-    key	 <KP2> {       [	    KP_2 ] };

-    key	 <KP3> {       [	    KP_3 ] };

-    key <KPEN> {       [	KP_Enter ] };

-

-    key	 <KP0> {       [	    KP_0 ] };

-    key <KPDL> {       [      KP_Decimal ] };

-

-    // Key to support Lock-Down Modifier descriptions for R5

-    //

-    key	 <LDM> {       [	NoSymbol ] };

-};

-

-xkb_symbols "vt108" {

-

-    include "digital_vndr/vt(vt105)"

-

-    replace key <LCMP> { [ Mode_switch ] };

-

-    key <LALT> {       [	   Alt_L,	   Meta_L ] };

-    key <RALT> {       [	   Alt_R,	   Meta_R ] };

-    key <RCMP> {       [       Multi_key ] };

-};

+//
+//Copyright (c) 1996  Digital Equipment Corporation
+//
+//Permission is hereby granted, free of charge, to any person obtaining
+//a copy of this software and associated documentation files (the
+//"Software"), to deal in the Software without restriction, including
+//without limitation the rights to use, copy, modify, merge, publish,
+//distribute, sublicense, and sell copies of the Software, and to
+//permit persons to whom the Software is furnished to do so, subject to
+//the following conditions:
+//
+//The above copyright notice and this permission notice shall be included
+//in all copies or substantial portions of the Software.
+//
+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+//OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+//IN NO EVENT SHALL DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM,
+//DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+//OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
+//THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+//Except as contained in this notice, the name of the Digital Equipment 
+//Corporation shall not be used in advertising or otherwise to promote
+//the sale, use or other dealings in this Software without prior written
+//authorization from Digital Equipment Corporation.
+//
+// HISTORY
+// Log
+// Revision 1.2  1996/06/18  09:10:19  erik
+// use flags correctly, assorted cleanups and consortium fixes
+//
+// Revision 1.1.6.2  1995/12/19  19:56:39  William_Walker
+// 	Update to XKB 0.65
+// 	[1995/12/17  02:37:47  William_Walker]
+//
+// Revision 1.1.2.5  1995/07/11  21:20:50  William_Walker
+// 	Make RALT act as RALT
+// 	[1995/07/11  21:18:28  William_Walker]
+// 
+// Revision 1.1.2.4  1995/06/27  12:18:41  William_Walker
+// 	Add LK201 and LK450 support as well as TW and DP variants.
+// 	[1995/06/26  20:30:37  William_Walker]
+// 
+// Revision 1.1.2.3  1995/06/09	 20:55:21  William_Walker
+// 	Add VT105 layout support and ISO group support
+// 	[1995/06/09  20:43:09  William_Walker]
+// 
+// Revision 1.1.2.2  1995/06/05	 19:25:04  William_Walker
+// 	New file.  I love keymaps.
+// 	[1995/06/05  18:17:58  William_Walker]
+// 
+// EndLog
+// 
+// @(#)RCSfile: vt  Revision: /main/3  (DEC) Date: 1996/01/24 12:15:08 
+// 
+xkb_symbols "vt105" {
+
+    // Modifier mappings
+    //
+    modifier_map Shift		{ Shift_L, Shift_R		};
+    modifier_map Lock		{ Caps_Lock			};
+    modifier_map Control	{ Control_L, Control_R		};
+    modifier_map Mod1		{ Alt_L, Alt_R, Meta_L, Meta_R	};
+    modifier_map Mod3		{ Mode_switch			};
+
+    // Common keys
+    //
+    key <BKSP> {       [	  Delete ] };
+    key	 <TAB> {       [	     Tab ] };
+    key <RTRN> {       [	  Return ] };
+    key <LCTL> {       [       Control_L ] };
+    key <CAPS> {       [       Caps_Lock ] };
+    key <LFSH> {       [	 Shift_L ] };
+    key <RTSH> {       [	 Shift_R ] };
+    key <LCMP> {       [   Alt_L, Meta_L ] };
+    key <SPCE> {       [	   space ] };
+
+    // "Function" keys
+    //
+    key <FK01> {       [	       F1 ] };
+    key <FK02> {       [	       F2 ] };
+    key <FK03> {       [	       F3 ] };
+    key <FK04> {       [	       F4 ] };
+    key <FK05> {       [	       F5 ] };
+    key <FK06> {       [	       F6 ] };
+    key <FK07> {       [	       F7 ] };
+    key <FK08> {       [	       F8 ] };
+    key <FK09> {       [	       F9 ] };
+    key <FK10> {       [	      F10 ] };
+    key <FK11> {       [	   Escape,	      F11 ] };
+    key <FK12> {       [	      F12 ] };
+    key <FK13> {       [	      F13 ] };
+    key <FK14> {       [	      F14 ] };
+    key <FK17> {       [	      F17 ] };
+    key <FK18> {       [	      F18 ] };
+    key <FK19> {       [	      F19 ] };
+    key <FK20> {       [	      F20 ] };
+
+    // "Editing" keys
+    //
+    key <HELP> {       [	    Help ] };
+    key	  <DO> {       [	    Menu ] };
+    key <FIND> {       [	    Find ] };
+    key	 <INS> {       [	  Insert ] };
+    key <DELE> {       [       apLineDel ] };
+    key <SELE> {       [	  Select ] };
+    key <PGUP> {       [	   Prior ] };
+    key <PGDN> {       [	    Next ] };
+
+    key	  <UP> {       [	      Up ] };
+    key <LEFT> {       [	    Left ] };
+    key <DOWN> {       [	    Down ] };
+    key <RGHT> {       [	   Right ] };
+
+    // "Keypad" keys
+    //
+    key <KPF1> {
+	type= "SHIFT+ALT",
+	symbols[Group1]= [	     KP_F1,Pointer_EnableKeys ]
+    };
+    key <KPF2> {       [	   KP_F2 ] };
+    key <KPF3> {       [	   KP_F3 ] };
+    key <KPF4> {       [	   KP_F4 ] };
+
+    key	 <KP7> {       [	    KP_7 ] };
+    key	 <KP8> {       [	    KP_8 ] };
+    key	 <KP9> {       [	    KP_9 ] };
+    key <KPSU> {       [     KP_Subtract ] };
+
+    key	 <KP4> {       [	    KP_4 ] };
+    key	 <KP5> {       [	    KP_5 ] };
+    key	 <KP6> {       [	    KP_6 ] };
+    key <KPCO> {       [    KP_Separator ] };
+
+    key	 <KP1> {       [	    KP_1 ] };
+    key	 <KP2> {       [	    KP_2 ] };
+    key	 <KP3> {       [	    KP_3 ] };
+    key <KPEN> {       [	KP_Enter ] };
+
+    key	 <KP0> {       [	    KP_0 ] };
+    key <KPDL> {       [      KP_Decimal ] };
+
+    // Key to support Lock-Down Modifier descriptions for R5
+    //
+    key	 <LDM> {       [	NoSymbol ] };
+};
+
+xkb_symbols "vt108" {
+
+    include "digital_vndr/vt(vt105)"
+
+    replace key <LCMP> { [ Mode_switch ] };
+
+    key <LALT> {       [	   Alt_L,	   Meta_L ] };
+    key <RALT> {       [	   Alt_R,	   Meta_R ] };
+    key <RCMP> {       [       Multi_key ] };
+};