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] 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}) ?