From a311521484cc38ab5e3cabb0c2926db50c36e4ea Mon Sep 17 00:00:00 2001
From: "Sergey V. Udaltsov" <svu@gnome.org>
Date: Wed, 17 Dec 2008 17:08:36 +0000
Subject: [PATCH] fixing lock modifier for jp by using replace option for CAPS,
 b.fd.o#8085

---
 ChangeLog        |  6 ++++++
 symbols/capslock |  6 +++---
 symbols/compose  |  2 +-
 symbols/ctrl     | 14 +++++++-------
 4 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 29ae3ff..9172cee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-12-17  Sergey Udaltsov
+
+	* symbols/capslock, symbols/compose, symbols/ctrl: fix lock modifier
+	for jp, making "CAPS" replace key,
+	http://bugs.freedesktop.org/show_bug.cgi?id=8805
+
 2008-12-15  Sergey Udaltsov
 
 	* symbols/ru: added Kalmyk variant, thanks to Anatoly Mironov and
diff --git a/symbols/capslock b/symbols/capslock
index f9f4827..b44df03 100644
--- a/symbols/capslock
+++ b/symbols/capslock
@@ -2,19 +2,19 @@
 
 default partial hidden modifier_keys
 xkb_symbols "capslock" {
-    key <CAPS> {	[	Caps_Lock		]	};
+    replace key <CAPS> {	[	Caps_Lock		]	};
     modifier_map Lock { Caps_Lock };
 };
 
 partial hidden modifier_keys
 xkb_symbols "shiftlock" {
-    key <CAPS> {	[	Shift_Lock		]	};
+    replace key <CAPS> {	[	Shift_Lock		]	};
     modifier_map Shift { Shift_Lock };
 };
 
 partial hidden modifier_keys
 xkb_symbols "grouplock" {
-    key <CAPS> {	[	ISO_Next_Group,	Caps_Lock	]	};
+    replace key <CAPS> {	[	ISO_Next_Group,	Caps_Lock	]	};
 };
 
 partial hidden modifier_keys
diff --git a/symbols/compose b/symbols/compose
index 72e92ef..521d93e 100644
--- a/symbols/compose
+++ b/symbols/compose
@@ -29,7 +29,7 @@ xkb_symbols "rctrl" {
 
 partial modifier_keys
 xkb_symbols "caps" {
-    key <CAPS> { type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] };
+    replace key <CAPS> { type="TWO_LEVEL", [ Multi_key, Multi_key ] };
 };
 
 partial modifier_keys
diff --git a/symbols/ctrl b/symbols/ctrl
index ca3b8bd..e9c4eff 100644
--- a/symbols/ctrl
+++ b/symbols/ctrl
@@ -5,15 +5,15 @@
 // eliminate the caps lock key completely (replace with control)
 partial modifier_keys 
 xkb_symbols "nocaps" {
-    key <CAPS>	{  symbols[Group1]= [ Control_L, Control_L ] };
+    replace key <CAPS>	{  [ Control_L, Control_L ] };
     modifier_map  Control { <CAPS>, <LCTL> };
 };
 
 // swap the caps lock key with the left control key
 partial modifier_keys 
 xkb_symbols "swapcaps" {
-    key <CAPS>	{  symbols[Group1]= [ Control_L ] };
-    key <LCTL>	{  symbols[Group1]= [ Caps_Lock ] };
+    replace key <CAPS>	{  [ Control_L ] };
+    replace key <LCTL>	{  [ Caps_Lock ] };
 };
 
 // moves the control key to the middle row and the caps lock
@@ -21,8 +21,8 @@ xkb_symbols "swapcaps" {
 // file has defined appropriate aliases for the keys in question.
 partial modifier_keys 
 xkb_symbols "ctrl_ac" {
-    key <AC00>	{  symbols[Group1]= [ Control_L ] };
-    key <AA00>	{  symbols[Group1]= [ Caps_Lock ] };
+    replace key <AC00>	{  [ Control_L ] };
+    replace key <AA00>	{  [ Caps_Lock ] };
 };
 
 // Moves the control key to the bottom row and the caps lock
@@ -30,8 +30,8 @@ xkb_symbols "ctrl_ac" {
 // file has defined appropriate aliases for the keys in question.
 partial modifier_keys 
 xkb_symbols "ctrl_aa" {
-    key <AA00>	{  symbols[Group1]= [ Control_L ] };
-    key <AC00>	{  symbols[Group1]= [ Caps_Lock ] };
+    replace key <AA00>	{  [ Control_L ] };
+    replace key <AC00>	{  [ Caps_Lock ] };
 };
 
 // Right Ctrl works as Right Alt
-- 
2.32.0.93.g670b81a890