From 91b89ae680abfe6341f89ccb04dba0fbc3988cbb Mon Sep 17 00:00:00 2001
From: Stephan Hilb <stephan@ecshi.net>
Date: Fri, 18 Feb 2011 21:09:18 +0100
Subject: [PATCH] Don't include caps(caps_lock) by default

This fixes a caps lock modifier rebinding issue in xmodmap. (bug #34318)
caps(caps_lock) will now only be included when needed, i.e. when option shift:both_capslock is set.
---
 compat/complete     |    1 -
 compat/default      |    1 -
 rules/base.o_c.part |    2 +-
 3 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/compat/complete b/compat/complete
index cd8d059..dd49a5c 100644
--- a/compat/complete
+++ b/compat/complete
@@ -8,6 +8,5 @@ default xkb_compatibility "complete"  {
     augment "misc"
     augment "xfree86"
     augment "level5"
-    augment "caps(caps_lock)"
 };
 
diff --git a/compat/default b/compat/default
index 090793f..5355e13 100644
--- a/compat/default
+++ b/compat/default
@@ -10,5 +10,4 @@ default xkb_compatibility "default"  {
 // ??should be changed/renamed/removed
 //    augment "xfree86"
     augment "japan"
-    augment "caps(caps_lock)"
 };
diff --git a/rules/base.o_c.part b/rules/base.o_c.part
index 352f8b3..749d297 100644
--- a/rules/base.o_c.part
+++ b/rules/base.o_c.part
@@ -3,4 +3,4 @@
   grp_led:scroll	=	+ledscroll(group_lock)
   japan:kana_lock	=	+japan(kana_lock)
   caps:shiftlock	=	+ledcaps(shift_lock)
-
+  shift:both_capslock	=	+caps(caps_lock)
-- 
1.7.1