[Pkg-kbd-commit] r184 - people/zinoviev/console-setup/Keyboard

[Anton Zinoviev]

Author: zinoviev
Date: 2006-07-20 13:40:07 +0000 (Thu, 20 Jul 2006)
New Revision: 184

Modified:
   people/zinoviev/console-setup/Keyboard/ckbcomp
Log:
console-setup(ckbcomp): do not output NoSymb keysyms with -compact


Modified: people/zinoviev/console-setup/Keyboard/ckbcomp
===================================================================
--- people/zinoviev/console-setup/Keyboard/ckbcomp	2006-07-20 13:06:43 UTC (rev 183)
+++ people/zinoviev/console-setup/Keyboard/ckbcomp	2006-07-20 13:40:07 UTC (rev 184)
@@ -2722,13 +2722,11 @@
 	}
     }
     if ($compact) {
-	if ($vector[0] ne $vector[16] or $vector[1] ne $vector[17]) {
-	    print "keycode $kernel_code = ".
-		"@vector[0, 1, 16, 17, 4, 20, 8, 24, 12, 28]\n";
-	} else {
-	    print "keycode $kernel_code = ".
-		"@vector[0, 1, 2, 3, 4, 6, 8, 10, 12, 14]\n";
-	}
+	my $line = ($vector[0] ne $vector[16] or $vector[1] ne $vector[17]
+		    ? "@vector[0, 1, 16, 17, 4, 20, 8, 24, 12, 28]"
+		    : "@vector[0, 1, 2, 3, 4, 6, 8, 10, 12, 14]");
+	$line =~ s/NoSymbol/VoidSymbol/g;
+	print "keycode $kernel_code = $line\n";
     } elsif ($no_NoSymbol) {
 	print "keycode $kernel_code = @vector\n";
     } else {