From 49dbf3b4a53c0bdc8c13df7026c3ccbde2a30ded Mon Sep 17 00:00:00 2001
From: Pablo Saratxaga <pablo@mandriva.com>
Date: Mon, 28 Feb 2005 18:49:04 +0000
Subject: define 'compose:rwin' in XkbOptions when $keyboard->{GRP_TOGGLE} is
 different than "rwin_toggle" and also when $keyboard->{GRP_TOGGLE} is not
 defined.

---
 perl-install/keyboard.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/perl-install/keyboard.pm b/perl-install/keyboard.pm
index ac867806e..6f47c64a6 100644
--- a/perl-install/keyboard.pm
+++ b/perl-install/keyboard.pm
@@ -525,9 +525,9 @@ sub keyboard2full_xkb {
 	XkbModel => $XkbModel,
 	XkbOptions => join(',', 
 			   if_($keyboard->{GRP_TOGGLE},
-			       if_($keyboard->{GRP_TOGGLE} ne 'rwin_toggle', 'compose:rwin'), 
 			       "grp:$keyboard->{GRP_TOGGLE}", 
 			       'grp_led:scroll'),
+			   if_($keyboard->{GRP_TOGGLE} ne 'rwin_toggle', 'compose:rwin'), 
 			   ),
     };
 }
-- 
cgit v1.2.1