Attachment 141077 Details for Bug 193922 – Differences between upstream bug and our attachment 140701

[patch] Differences between upstream bug and our attachment 140701

freedesktop-140701.diff (text/plain), 2.38 KB, created by Matěj Cepl on 2006-11-13 17:30:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matěj Cepl

Created: 2006-11-13 17:30:02 UTC

Size: 2.38 KB

patch

obsolete

>reverted:
>--- xkb-data/rules/base.o_s.part
>+++ xkb-data.orig/rules/base.o_s.part
>@@ -23,7 +23,6 @@
>   grp:sclk_toggle	=	+group(sclk_toggle)
>   lv3:switch		=	+level3(switch)
>   lv3:ralt_switch	=	+level3(ralt_switch)
>-  lv3:ralt_switch_multikey	=	+level3(ralt_switch_multikey)
>   lv3:lalt_switch	=	+level3(lalt_switch)
>   lv3:alt_switch	=	+level3(alt_switch)
>   lv3:menu_switch	=	+level3(menu_switch)
>reverted:
>--- xkb-data/rules/base.xml.in
>+++ xkb-data.orig/rules/base.xml.in
>@@ -2841,12 +2841,6 @@
>           <_description>Press Right Alt key to choose 3rd level.</_description>
>         </configItem>
>       </option>
>-      <option>
>-        <configItem>
>-          <name>lv3:ralt_switch_multikey</name>
>-          <_description>Press Right Alt key to choose 3rd level, Shift+Right Alt key is Multi_Key.</_description>
>-        </configItem>
>-      </option>
>     </group>
>     <group allowMultipleSelection="false">
>       
>diff -u xkb-data/symbols/level3 xkeyboard-config-0.8/symbols/level3
>--- xkb-data/symbols/level3
>+++ xkeyboard-config-0.8/symbols/level3	2006-11-08 20:31:52.000000000 +0100
>@@ -17,12 +17,12 @@
>   modifier_map Mod5   { ISO_Level3_Shift };
> };
> 
>+// Fedora bug #193922
> partial modifier_keys
>-xkb_symbols "ralt_switch_multikey" {
>-  key <RALT> {
>-    type[Group1]="TWO_LEVEL",
>-    symbols[Group1] = [ ISO_Level3_Shift, Multi_key ]
>-    };
>+xkb_symbols "ralt_switch_multikey" {  
>+    key <RALT>  { type[Group1]="TWO_LEVEL",
>+                  [ ISO_Level3_Shift, Multi_key ]   };
>+    modifier_map Mod5   { <RALT> };
> };
> 
> // special case or right Alt switch - for use with grp:alts_toggle
>only in patch2:
>unchanged:
>--- xkeyboard-config-orig/symbols/gb	2005-09-21 23:29:26.000000000 +0200
>+++ xkeyboard-config-0.8/symbols/gb	2006-11-08 20:32:39.000000000 +0100
>@@ -26,7 +26,7 @@
>     key <BKSL>	{ [numbersign, asciitilde,   dead_grave,   dead_breve ]	};
>     key <LSGT>	{ [ backslash,        bar,          bar,    brokenbar ]	};
> 
>-    include "level3(ralt_switch)"
>+    include "level3(ralt_switch_multikey)"
> };
> 
> partial alphanumeric_keys 
>@@ -58,7 +58,7 @@
>     key <BKSL>  { [ numbersign, dead_tilde,            bar,         bar ] };
>     key <LSGT>  { [  backslash,        bar,            bar,         bar ] };
> 
>-    include "level3(ralt_switch)"
>+    include "level3(ralt_switch_multikey)"
> };
> 
> // Dvorak (UK) keymap (by odaen) allowing the usage of

Actions: View | Diff

Attachments on bug 193922: 134203 | 140701 | 141075 | 141076 | 141077 | 141079