remove duplicate std limit + format macro defs

[ardour.git] / tools / fmt-bindings

diff --git a/tools/fmt-bindings b/tools/fmt-bindings
index be1b23bf528a22ccc88dd685d1c2cf209b3ba839..39849b1847734155df9b576470af07a12be999d9 100755 (executable)
--- a/tools/fmt-bindings
+++ b/tools/fmt-bindings
@@ -182,8 +182,12 @@ while (<>) {
            if ($merge_bindings{$lookup}) {
                $binding = $merge_bindings{$lookup};
            } else {
-               # this action is not defined in the merge from set, so forget it 
-               next;
+               if ($key =~ /^\+/) {
+                   # forced inclusion of bindings from template
+               } else {
+                   # this action is not defined in the merge from set, so forget it 
+                   next;
+               }
            }
        } 
 
@@ -198,7 +202,7 @@ while (<>) {
                foreach $k (keys %gtk_modifier_map) {
                    $gtk_binding =~ s/\@$k\@/$gtk_modifier_map{$k}/;
                }
-               print "(gtk_accel_map \"<Actions>/$action\" \"$gtk_binding\")\n";
+               print "(gtk_accel_path \"<Actions>/$action\" \"$gtk_binding\")\n";
            }
        }