summaryrefslogtreecommitdiff
path: root/nls/en_US.UTF-8
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@sun.com>2009-04-08 19:42:25 -0700
committerAlan Coopersmith <alan.coopersmith@sun.com>2009-04-08 19:42:25 -0700
commitfd62d3318c846cd43d66a505946e94704d7d83dc (patch)
tree37e2809c1cd777c3de1ca0d33e4d37e7144c79ce /nls/en_US.UTF-8
parenteac57c77afdf44f50692225b8b0345a7c927bc84 (diff)
downloadxorg-lib-libX11-fd62d3318c846cd43d66a505946e94704d7d83dc.tar.gz
Revert "Change masculine to ordmasculine in Compose file comments"
This reverts commit 892b401d5acc055803a20e349ede0d64490f2230. As Julien Cristau correctly points out, I misread the Compose file grammar in modules/im/ximcp/imLcPrs.c, and those are keysyms, not comments, and the keysym is named XK_masculine in keysymdef.h. This change is thus a bug in the Solaris compose tables to be fixed, not an improvement to bring upstream.
Diffstat (limited to 'nls/en_US.UTF-8')
-rw-r--r--nls/en_US.UTF-8/Compose.pre8
1 files changed, 4 insertions, 4 deletions
diff --git a/nls/en_US.UTF-8/Compose.pre b/nls/en_US.UTF-8/Compose.pre
index 04eccf41..7c46ddbd 100644
--- a/nls/en_US.UTF-8/Compose.pre
+++ b/nls/en_US.UTF-8/Compose.pre
@@ -483,10 +483,10 @@ XCOMM Part 3
<Multi_key> <asciicircum> <1> : "¹" onesuperior # SUPERSCRIPT ONE
<dead_circumflex> <KP_1> : "¹" onesuperior # SUPERSCRIPT ONE
<Multi_key> <asciicircum> <KP_1> : "¹" onesuperior # SUPERSCRIPT ONE
-<dead_circumflex> <Multi_key> <underscore> <o> : "º" ordmasculine # MASCULINE ORDINAL INDICATOR
-<Multi_key> <asciicircum> <underscore> <o> : "º" ordmasculine # MASCULINE ORDINAL INDICATOR
-<dead_circumflex> <Multi_key> <underbar> <o> : "º" ordmasculine # MASCULINE ORDINAL INDICATOR
-<Multi_key> <asciicircum> <underbar> <o> : "º" ordmasculine # MASCULINE ORDINAL INDICATOR
+<dead_circumflex> <Multi_key> <underscore> <o> : "º" masculine # MASCULINE ORDINAL INDICATOR
+<Multi_key> <asciicircum> <underscore> <o> : "º" masculine # MASCULINE ORDINAL INDICATOR
+<dead_circumflex> <Multi_key> <underbar> <o> : "º" masculine # MASCULINE ORDINAL INDICATOR
+<Multi_key> <asciicircum> <underbar> <o> : "º" masculine # MASCULINE ORDINAL INDICATOR
<Multi_key> <1> <4> : "¼" onequarter # VULGAR FRACTION ONE QUARTER
<Multi_key> <1> <2> : "½" onehalf # VULGAR FRACTION ONE HALF
<Multi_key> <3> <4> : "¾" threequarters # VULGAR FRACTION THREE QUARTERS