# HG changeset patch
# User wenzelm
# Date 1214680881 -7200
# Node ID d10ec4969b9fa5b1c1082038b8b540e6bc4ab960
# Parent  b16563f2d274f68d93ca0eb67acd8ffe99672a0b
allow overlap of minor keywords and commands;

diff -r b16563f2d274 -r d10ec4969b9f lib/scripts/keywords.pl
--- a/lib/scripts/keywords.pl	Sat Jun 28 21:21:20 2008 +0200
+++ b/lib/scripts/keywords.pl	Sat Jun 28 21:21:21 2008 +0200
@@ -16,10 +16,14 @@
 
 sub set_keyword {
   my ($name, $kind) = @_;
-  if (defined $keywords{$name} and $keywords{$name} ne $kind) {
-    print STDERR "### Inconsistent declaration of keyword \"${name}\": $keywords{$name} vs ${kind}\n";
+  if (defined $keywords{$name} and $keywords{$name} ne $kind and $keywords{$name} ne "minor") {
+    if ($kind ne "minor") {
+      print STDERR "### Inconsistent declaration of keyword \"${name}\": $keywords{$name} vs ${kind}\n";
+      $keywords{$name} = $kind;
+    }
+  } else {
+    $keywords{$name} = $kind;
   }
-  $keywords{$name} = $kind;
 }
 
 sub collect_keywords {