Rebase auf xkeyboard-config git („-lang“-varianten noch nicht aktualisiert).

Korrekturen/Aufräumarbeiten

git-svn-id: https://svn.neo-layout.org@2228 b9310e46-f624-0410-8ea1-cfbb3a30dc96

2 files changed, 7 insertions, 8 deletions

diff --git a/linux/X/symbols/level5 b/linux/X/symbols/level5
index e829e90..ff7041c 100644
--- a/linux/X/symbols/level5
+++ b/linux/X/symbols/level5
@@ -18,22 +18,21 @@ xkb_symbols "rctrl_switch" {
 };
 
 // The following modifier keys are used to switch to the third shift and to set a
-// corresponding lock, implemented as NumLock.  They do not use *Level5* keysyms,
-// as some applications get confused by it.
+// corresponding lock, implemented as NumLock.
 
 partial modifier_keys
 xkb_symbols "neomod_map" {
+  key.type[Group1] = "ONE_LEVEL";
+
   replace key <MDSW> {
-    type[Group1] = "ONE_LEVEL",
-    vmods[Group1] = LevelFive,
+    vmods = LevelFive,
     symbols[Group1] = [ ISO_Level5_Shift ],
     actions[Group1] = [ SetMods(modifiers=LevelFive) ]
   };
   modifier_map Mod3 { <MDSW> };
 
   replace key <HYPR> {
-    type[Group1] = "ONE_LEVEL",
-    vmods[Group1] = NumLock,
+    vmods = NumLock,
     symbols[Group1] = [ NoSymbol ],
     actions[Group1] = [ SetMods(modifiers=NumLock) ]
   };
diff --git a/linux/X/symbols/shift b/linux/X/symbols/shift
index ccb4ae1..78951c1 100644
--- a/linux/X/symbols/shift
+++ b/linux/X/symbols/shift
@@ -40,7 +40,7 @@ xkb_symbols "both_capslock" {
   include "shift(rshift_both_capslock)"
 };
 
-// When pressed alone, release Lock, whan pressed with another Shift key, set Lock.
+// Release Lock when pressed alone and set Lock when pressed with another Shift key.
 partial modifier_keys
 xkb_symbols "lshift_both_capslock_cancel" {
   key <LFSH> {
@@ -48,7 +48,7 @@ xkb_symbols "lshift_both_capslock_cancel" {
     symbols[Group1] = [ Shift_L,                       Caps_Lock                ]
   };
 };
-// When pressed alone, release Lock, whan pressed with another Shift key, set Lock.
+// Release Lock when pressed alone and set Lock when pressed with another Shift key.
 partial modifier_keys
 xkb_symbols "rshift_both_capslock_cancel" {
   key <RTSH> {