From 154377691c9b811bbd32eab75f5e17575e47538b Mon Sep 17 00:00:00 2001
From: Dima Kogan <dima@secretsauce.net>
Date: Tue, 19 May 2020 08:54:01 -0700
Subject: [PATCH 1/4] minor documentation update

---
 bin/feedgnuplot | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bin/feedgnuplot b/bin/feedgnuplot
index a876e63..917c171 100755
--- a/bin/feedgnuplot
+++ b/bin/feedgnuplot
@@ -2246,7 +2246,8 @@ also.
 
 C<--geometry>
 
-If using X11, specifies the size, position of the plot window
+Specifies the size, position of the plot window. This applies I<only> to the
+C<x11> gnuplot terminal, and has no effect otherwise.
 
 =item
 

From 4234c947377db5c5f9df166a8b31adfd109a778d Mon Sep 17 00:00:00 2001
From: Dima Kogan <dima@secretsauce.net>
Date: Tue, 19 May 2020 08:59:56 -0700
Subject: [PATCH 2/4] minor documentation update

---
 bin/feedgnuplot | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/bin/feedgnuplot b/bin/feedgnuplot
index 917c171..a817330 100755
--- a/bin/feedgnuplot
+++ b/bin/feedgnuplot
@@ -2247,7 +2247,9 @@ also.
 C<--geometry>
 
 Specifies the size, position of the plot window. This applies I<only> to the
-C<x11> gnuplot terminal, and has no effect otherwise.
+C<x11> gnuplot terminal, and has no effect otherwise. To control the window size
+for any other terminal, ask for the terminal explicitly, with the options
+specifying the size. For instance C<--terminal 'qt size 1024,768'>
 
 =item
 

From 4244299169dde3c3cce7507df7c264cbdda5bac2 Mon Sep 17 00:00:00 2001
From: Dima Kogan <dima@secretsauce.net>
Date: Mon, 20 Jul 2020 15:47:32 -0700
Subject: [PATCH 3/4] Revert "Removed reference to no-longer-existing variable"

This reverts commit 7e1e6af184f217b7ec2629701ae984644279da3e.

This commit did nothing other than introduce a bug. --style is supposed to
override --with, but after this commit, --style was ADDED to --with, which is
wrong
---
 bin/feedgnuplot | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/bin/feedgnuplot b/bin/feedgnuplot
index a817330..f97b05e 100755
--- a/bin/feedgnuplot
+++ b/bin/feedgnuplot
@@ -1188,7 +1188,10 @@ sub getCurve
 
   if( !exists $curveFromID{$id} )
   {
-    my $curve = {extraoptions      => ( exists $options{curvestyleall}) ?
+    my $curve = {# if we have a catch-all style and no specific style, use
+                 # the catch-all style
+                 extraoptions      => (!exists $options{curvestyle_hash}{$id} &&
+                                        exists $options{curvestyleall}) ?
                                       "$options{curvestyleall} " : ' ',
                  everyoptions      => (!exists $options{every_hash}{$id} &&
                                         exists $options{everyall}) ?

From c8dac15db3b409c9a69b11b017dae2d838d3e4da Mon Sep 17 00:00:00 2001
From: Dima Kogan <dima@secretsauce.net>
Date: Mon, 20 Jul 2020 15:51:33 -0700
Subject: [PATCH 4/4] version bump

---
 Changes         | 7 +++++++
 bin/feedgnuplot | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/Changes b/Changes
index 299d400..4c76abb 100644
--- a/Changes
+++ b/Changes
@@ -1,3 +1,10 @@
+feedgnuplot (1.55)
+
+  * Fixed regression introduced in 1.54:
+    --style now correctly overrides --with
+
+ -- Dima Kogan <dkogan@debian.org>  Mon, 20 Jul 2020 15:51:23 -0700
+
 feedgnuplot (1.54)
 
   * Added --every and --everyall to decimate the input data
diff --git a/bin/feedgnuplot b/bin/feedgnuplot
index f97b05e..26147e3 100755
--- a/bin/feedgnuplot
+++ b/bin/feedgnuplot
@@ -16,7 +16,7 @@ use Pod::Usage;
 use Time::Piece;
 
 # Makefile.PL assumes this is in ''
-my $VERSION = '1.54';
+my $VERSION = '1.55';
 
 my %options;
 interpretCommandline();