summaryrefslogtreecommitdiff
path: root/gtk/compose
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2021-04-01 15:15:47 -0400
committerMatthias Clasen <mclasen@redhat.com>2021-04-01 15:31:21 -0400
commitf98abe4400eccf6478b6569d67564e5b8cfc60b1 (patch)
tree92e8161fe4eecb60964c60f4ff3dab51cb1fb6fe /gtk/compose
parent405fab8b364910b81ae76e8324207cf529c430a4 (diff)
downloadgtk+-f98abe4400eccf6478b6569d67564e5b8cfc60b1.tar.gz
Revert Compose sequence changes
This was breaking muscle memory of people with the us intl keyboard layout, for important keys such as '. The unfortunate side-effect is that our handling of <dead_acute> is a bit hampered by sequences that don't fit the pattern. But such is life. Fixes: #3807
Diffstat (limited to 'gtk/compose')
-rw-r--r--gtk/compose/gtk-compose-lookaside.txt4
-rw-r--r--gtk/compose/gtk-compose-remove.txt14
2 files changed, 0 insertions, 18 deletions
diff --git a/gtk/compose/gtk-compose-lookaside.txt b/gtk/compose/gtk-compose-lookaside.txt
index c846cc8121..3f3b23c69c 100644
--- a/gtk/compose/gtk-compose-lookaside.txt
+++ b/gtk/compose/gtk-compose-lookaside.txt
@@ -403,7 +403,3 @@
<Multi_key> <Greek_omicron> <apostrophe> : "ό" U03CC
<Multi_key> <Greek_upsilon> <apostrophe> : "ύ" U03CD
<Multi_key> <Greek_omega> <apostrophe> : "ώ" U03CE
-
-# This sequence matches our handling of dead keys better.
-# We remove the xorg sequence that maps this to '
-<dead_acute> <space> : "´" acute # ACUTE ACCENT
diff --git a/gtk/compose/gtk-compose-remove.txt b/gtk/compose/gtk-compose-remove.txt
deleted file mode 100644
index 620df9e9ce..0000000000
--- a/gtk/compose/gtk-compose-remove.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-<dead_tilde> <dead_tilde> : "~" asciitilde # TILDE
-<dead_acute> <space> : "'" apostrophe # APOSTROPHE
-<dead_acute> <dead_acute> : "´" acute # ACUTE ACCENT
-<dead_grave> <dead_grave> : "`" grave # GRAVE ACCENT
-<dead_abovering> <dead_abovering> : "°" degree # DEGREE SIGN
-<dead_macron> <dead_macron> : "¯" macron # MACRON
-<dead_breve> <dead_breve> : "˘" breve # BREVE
-<dead_abovedot> <dead_abovedot> : "˙" abovedot # DOT ABOVE
-<dead_diaeresis> <dead_diaeresis> : "¨" diaeresis # DIAERESIS
-<dead_doubleacute> <dead_doubleacute> : "˝" U2dd # DOUBLE ACUTE ACCENT
-<dead_caron> <dead_caron> : "ˇ" caron # CARON
-<dead_cedilla> <dead_cedilla> : "¸" cedilla # CEDILLA
-<dead_ogonek> <dead_ogonek> : "˛" ogonek # OGONEK
-<dead_iota> <dead_iota> : "ͺ" U37a # GREEK YPOGEGRAMMENI