Sorting the Caps Lock options in a consistent manner.

By putting the related "capslock" and "shiftlock" options together, and
putting the "none" option last, both in the rules and the symbols file.

Signed-off-by: Benno Schulenberg <bensberg@justemail.net>

1 files changed, 11 insertions, 11 deletions

diff --git a/symbols/capslock b/symbols/capslock
index 19352f74..6b85c3d3 100644
--- a/symbols/capslock
+++ b/symbols/capslock
@@ -16,12 +16,6 @@ xkb_symbols "grouplock" {
 };
 
 hidden partial modifier_keys
-xkb_symbols "swapescape" {
-    key <CAPS> { [ Escape ] };
-    key <ESC>  { [ Caps_Lock ] };
-};
-
-hidden partial modifier_keys
 xkb_symbols "groupshift" {
     key <CAPS> {
         type[Group1] = "PC_ALT_LEVEL2",
@@ -30,6 +24,12 @@ xkb_symbols "groupshift" {
 };
 
 hidden partial modifier_keys
+xkb_symbols "swapescape" {
+    key <CAPS> { [ Escape ] };
+    key <ESC>  { [ Caps_Lock ] };
+};
+
+hidden partial modifier_keys
 xkb_symbols "escape" {
     key <CAPS> { [ Escape ] };
 };
@@ -57,11 +57,6 @@ xkb_symbols "menu" {
 };
 
 hidden partial modifier_keys
-xkb_symbols "none" {
-    key <CAPS> { [ VoidSymbol ] };
-};
-
-hidden partial modifier_keys
 xkb_symbols "numlock" {
     key <CAPS> { [ Num_Lock ] };
 };
@@ -77,3 +72,8 @@ xkb_symbols "ctrl_modifier" {
     };
     modifier_map Control { <CAPS> };
 };
+
+hidden partial modifier_keys
+xkb_symbols "none" {
+    key <CAPS> { [ VoidSymbol ] };
+};