[kbd] [PATCH] Enable UNUMBERs in compose definitions

[Michael Schutte <michi@uiae.at>]

As always, auto-conversion applies in case of XLATE mode (or no
KDSKBDIACRUC support).

Signed-off-by: Michael Schutte <michi@uiae.at>
---
 src/loadkeys.y |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/loadkeys.y b/src/loadkeys.y
index 64cb8ee..b2ba003 100644
--- a/src/loadkeys.y
+++ b/src/loadkeys.y
@@ -161,15 +161,16 @@ strline		: STRING LITERAL EQUALS STRLITERAL EOL
 			    addfunc(kbs_buf);
 			}
 		;
-compline        : COMPOSE CCHAR CCHAR TO CCHAR EOL
+compline        : COMPOSE compsym compsym TO compsym EOL
                         {
 			    compose($2, $3, $5);
 			}
-		 | COMPOSE CCHAR CCHAR TO rvalue EOL
-			{
-			    compose($2, $3, $5);
-			}
                 ;
+compsym		: CCHAR
+			{ $$ = $1; }
+		| UNUMBER
+			{ $$ = $1 ^ 0xf000; }
+		;
 singleline	:	{ mod = 0; }
 		  modifiers KEYCODE NUMBER EQUALS rvalue EOL
 			{
-- 
1.5.6.5