From: Steve Hancock <perltidy@users.sourceforge.net>
Date: Sun, 6 Jan 2019 01:46:15 +0000 (-0800)
Subject: -fbl has priority over -kgbd
X-Git-Tag: 20190601~33
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=7d59cf94b44761dbf7e8924c1bcced4400e80d0f;p=perltidy.git

-fbl has priority over -kgbd
---

diff --git a/lib/Perl/Tidy/Formatter.pm b/lib/Perl/Tidy/Formatter.pm
index 4eb8ec82..237d95a7 100644
--- a/lib/Perl/Tidy/Formatter.pm
+++ b/lib/Perl/Tidy/Formatter.pm
@@ -1523,6 +1523,9 @@ sub break_lines {
                 my $kgb_keep = !( defined( $rwant_blank_line_after->{$i} )
                     && $rwant_blank_line_after->{$i} == 2 );
 
+		# But the keep-old-blank-lines flag has priority over kgb flags
+		$kgb_keep = 1 if ($rOpts_keep_old_blank_lines == 2 );
+
                 if ($rOpts_keep_old_blank_lines && $kgb_keep) {
                     $self->flush();
                     $file_writer_object->write_blank_code_line(