From 3bfa29782285fd9a9fefcaf21fa0aa7df776d88b Mon Sep 17 00:00:00 2001
From: Mischa POSLAWSKY <perl@shiar.org>
Date: Sun, 18 Jun 2017 13:03:12 +0200
Subject: [PATCH] keys: load flags dependency within descriptions include

Complete setup from a single include, as both are closely related
and should not be distinctly selected.
---
 less.eng.inc.pl       | 3 ++-
 less.plp              | 1 -
 mplayer.eng.inc.pl    | 3 ++-
 mplayer.plp           | 1 -
 mutt.eng.inc.pl       | 1 +
 mutt.plp              | 1 -
 nethack.eng.inc.pl    | 3 ++-
 nethack.plp           | 1 -
 readline.eng.inc.pl   | 3 ++-
 readline.plp          | 1 -
 screen.eng.inc.pl     | 1 +
 screen.plp            | 1 -
 vi.eng.inc.pl         | 1 +
 vi.plp                | 1 -
 vimperator.eng.inc.pl | 2 +-
 vimperator.plp        | 1 -
 16 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/less.eng.inc.pl b/less.eng.inc.pl
index 92610e9..131bf4d 100644
--- a/less.eng.inc.pl
+++ b/less.eng.inc.pl
@@ -1,6 +1,6 @@
 use utf8;
-{
 
+{
 key => {
 	"\e"=> "alt<>/meta",
 
@@ -127,4 +127,5 @@ flag => {
 	more => [more => "A small subset is compatible with `more`."],
 },
 
+def => do 'less.inc.pl',
 }
diff --git a/less.plp b/less.plp
index e195056..582eef4 100644
--- a/less.plp
+++ b/less.plp
@@ -23,7 +23,6 @@ Html({
 <:
 use Shiar_Sheet::Keyboard 2;
 my $info = do 'less.eng.inc.pl' or die $@;
-$info->{def} = do 'less.inc.pl';
 my $keys = Shiar_Sheet::Keyboard->new($info);
 $keys->map($get{map}) or undef $get{map};
 $keys->print_rows($get{rows}, [1,0]);
diff --git a/mplayer.eng.inc.pl b/mplayer.eng.inc.pl
index a035b96..0cd0783 100644
--- a/mplayer.eng.inc.pl
+++ b/mplayer.eng.inc.pl
@@ -1,6 +1,6 @@
 use utf8;
-{
 
+{
 key => {
 	'[' => "slow down 10%",
 	']' => "speed up 10%",
@@ -67,4 +67,5 @@ flag => {
 	ext => ["optional" => "Some features depend on setup and/or parameters."],
 },
 
+def => do 'mplayer.inc.pl',
 }
diff --git a/mplayer.plp b/mplayer.plp
index a45063c..110018e 100644
--- a/mplayer.plp
+++ b/mplayer.plp
@@ -22,7 +22,6 @@ Html({
 <:
 use Shiar_Sheet::Keyboard 2;
 my $info = do 'mplayer.eng.inc.pl' or die $@;
-$info->{def} = do 'mplayer.inc.pl';
 my $keys = Shiar_Sheet::Keyboard->new($info);
 $keys->map($get{map}) or undef $get{map};
 $keys->print_rows($get{rows}, [1,0]);
diff --git a/mutt.eng.inc.pl b/mutt.eng.inc.pl
index 08e1e2e..c67cb3b 100644
--- a/mutt.eng.inc.pl
+++ b/mutt.eng.inc.pl
@@ -222,4 +222,5 @@ flag => {
 	arg => ["key<arg>" => "Commands with a dot need an argument afterwards."],
 },
 
+def => do 'mutt.inc.pl',
 }
diff --git a/mutt.plp b/mutt.plp
index 11ff474..3ab95a0 100644
--- a/mutt.plp
+++ b/mutt.plp
@@ -22,7 +22,6 @@ Html({
 <:
 use Shiar_Sheet::Keyboard 2;
 my $info = do 'mutt.eng.inc.pl' or die $@;
-$info->{def} = do 'mutt.inc.pl';
 my $keys = Shiar_Sheet::Keyboard->new($info);
 $keys->map($get{map}) or undef $get{map};
 $keys->print_rows($get{rows});
diff --git a/nethack.eng.inc.pl b/nethack.eng.inc.pl
index 62fed64..95e84af 100644
--- a/nethack.eng.inc.pl
+++ b/nethack.eng.inc.pl
@@ -1,6 +1,6 @@
 use utf8;
-{
 
+{
 key => {
 	'b' =>   "step left down\nnumpad 1",
 	'j' =>        "step down\nnumpad 2",
@@ -152,4 +152,5 @@ flag => {
 	argm => ["key<argm>" => "Requires a direction afterwards."],
 },
 
+def => do 'nethack.inc.pl',
 }
diff --git a/nethack.plp b/nethack.plp
index ae595b6..9c4c62d 100644
--- a/nethack.plp
+++ b/nethack.plp
@@ -22,7 +22,6 @@ Html({
 <:
 use Shiar_Sheet::Keyboard 2;
 my $info = do 'nethack.eng.inc.pl' or die $@;
-$info->{def} = do 'nethack.inc.pl';
 my $keys = Shiar_Sheet::Keyboard->new($info);
 $_->{"\e"} = ['me mode'] for values %{ $info->{def} };
 	# static reset button, even though it's not (officially) in the game
diff --git a/readline.eng.inc.pl b/readline.eng.inc.pl
index ecf467c..87eb061 100644
--- a/readline.eng.inc.pl
+++ b/readline.eng.inc.pl
@@ -1,6 +1,6 @@
 use utf8;
-{
 
+{
 key => {
 	'+<' => "history start",
 	'+>' => "history end",
@@ -98,4 +98,5 @@ flag => {
 	ext => ["bash" => "Default assignment in Bash shells, but not common readline."],
 },
 
+def => do 'readline.inc.pl',
 }
diff --git a/readline.plp b/readline.plp
index 53dc76f..ed5f366 100644
--- a/readline.plp
+++ b/readline.plp
@@ -22,7 +22,6 @@ Html({
 <:
 use Shiar_Sheet::Keyboard 2;
 my $info = do 'readline.eng.inc.pl' or die $@;
-$info->{def} = do 'readline.inc.pl';
 my $keys = Shiar_Sheet::Keyboard->new($info);
 $keys->map($get{map}) or undef $get{map};
 $keys->print_rows($get{rows} || '^x=213', [4,3,2]);
diff --git a/screen.eng.inc.pl b/screen.eng.inc.pl
index e0cdb5c..e13cb1b 100644
--- a/screen.eng.inc.pl
+++ b/screen.eng.inc.pl
@@ -78,4 +78,5 @@ flag => {
 	arg => ["key<arg>" => "Commands with a dot need a char argument afterwards."],
 },
 
+def => do 'screen.inc.pl',
 }
diff --git a/screen.plp b/screen.plp
index aeed949..c6feb72 100644
--- a/screen.plp
+++ b/screen.plp
@@ -23,7 +23,6 @@ Html({
 <:
 use Shiar_Sheet::Keyboard 2;
 my $info = do 'screen.eng.inc.pl' or die $@ // $!;
-$info->{def} = do 'screen.inc.pl';
 my $keys = Shiar_Sheet::Keyboard->new($info);
 $keys->map($get{map}) or undef $get{map};
 $keys->print_rows($get{rows});
diff --git a/vi.eng.inc.pl b/vi.eng.inc.pl
index 1a80065..03eabf3 100644
--- a/vi.eng.inc.pl
+++ b/vi.eng.inc.pl
@@ -478,4 +478,5 @@ flag => {
 	'ext new vim7' => ["vim7", "New in vim version 7.x."],
 },
 
+def => do 'vi.inc.pl',
 }
diff --git a/vi.plp b/vi.plp
index 750bbcf..203fdc8 100644
--- a/vi.plp
+++ b/vi.plp
@@ -22,7 +22,6 @@ Html({
 <:
 use Shiar_Sheet::Keyboard 2;
 my $info = do 'vi.eng.inc.pl' or die $@;
-$info->{def} = do 'vi.inc.pl';
 my $keys = Shiar_Sheet::Keyboard->new($info);
 $keys->map($get{map}) or undef $get{map};
 $keys->print_rows($get{rows});
diff --git a/vimperator.eng.inc.pl b/vimperator.eng.inc.pl
index e1630b5..2457fdb 100644
--- a/vimperator.eng.inc.pl
+++ b/vimperator.eng.inc.pl
@@ -1,6 +1,5 @@
 use utf8;
 {
-
 key => {
 	'~' => "open home<>dir",
 	'@' => "play macro",
@@ -151,4 +150,5 @@ flag => {
 	args => ["key<args>" => "Commands with two dots require variable arguments afterwards."],
 },
 
+def => do 'vimperator.inc.pl',
 }
diff --git a/vimperator.plp b/vimperator.plp
index 638c411..3fb7ba5 100644
--- a/vimperator.plp
+++ b/vimperator.plp
@@ -23,7 +23,6 @@ Html({
 <:
 use Shiar_Sheet::Keyboard 2;
 my $info = do 'vimperator.eng.inc.pl' or die $@;
-$info->{def} = do 'vimperator.inc.pl';
 $_->{"\e"} = ['mv mode', "normal mode"] for values %{ $info->{def} };
 delete $info->{def}->{''}->{"\e"};
 my $keys = Shiar_Sheet::Keyboard->new($info);
-- 
2.30.0