summaryrefslogtreecommitdiff
path: root/hw/xnest
diff options
context:
space:
mode:
authorDaniel Stone <daniel@fooishbar.org>2006-05-29 11:14:03 +0000
committerDaniel Stone <daniel@fooishbar.org>2006-05-29 11:14:03 +0000
commitfd8bde8bb0f9d796b3464973b53285c0a6d22a31 (patch)
tree3ca147e3cb1bad4dfe698e2a129cf731f8c27b8e /hw/xnest
parentdb0680cf70b8367e1f8a7fff9c0f6ec414db0542 (diff)
Remove -xkbmap argument.
Diffstat (limited to 'hw/xnest')
-rw-r--r--hw/xnest/Keyboard.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/hw/xnest/Keyboard.c b/hw/xnest/Keyboard.c
index 4e82c6ed0..9b4f1a1ab 100644
--- a/hw/xnest/Keyboard.c
+++ b/hw/xnest/Keyboard.c
@@ -1,5 +1,5 @@
/* $Xorg: Keyboard.c,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */
-/* $XdotOrg: xserver/xorg/hw/xnest/Keyboard.c,v 1.8 2005/07/14 03:36:44 kem Exp $ */
+/* $XdotOrg: xserver/xorg/hw/xnest/Keyboard.c,v 1.9 2006/03/27 22:25:56 daniels Exp $ */
/*
Copyright 1993 by Davor Matic
@@ -228,12 +228,6 @@ XkbError:
layout = XKB_DFLT_KB_LAYOUT;
variants = XKB_DFLT_KB_VARIANT;
options = XKB_DFLT_KB_OPTIONS;
- if (XkbInitialMap) {
- if ((names.keymap = strchr(XkbInitialMap, '/')) != NULL)
- ++names.keymap;
- else
- names.keymap = XkbInitialMap;
- }
XkbSetRulesDflts(rules, model, layout, variants, options);
XkbInitKeyboardDeviceStruct(pDev, &names, &keySyms, modmap,