From 1b3c5e91c1cad43a680cd2b767007fc93144c289 Mon Sep 17 00:00:00 2001 From: Steve Hancock Date: Mon, 28 Jun 2021 17:30:22 -0700 Subject: [PATCH] Remove limit on the value of -ci=n when -xci is set --- lib/Perl/Tidy/Formatter.pm | 15 --------------- local-docs/BugLog.pod | 14 +++++++++++--- 2 files changed, 11 insertions(+), 18 deletions(-) diff --git a/lib/Perl/Tidy/Formatter.pm b/lib/Perl/Tidy/Formatter.pm index de619024..f3c38e83 100644 --- a/lib/Perl/Tidy/Formatter.pm +++ b/lib/Perl/Tidy/Formatter.pm @@ -1104,21 +1104,6 @@ sub check_options { Exit(0); } - # Do not let the value of -ci exceed the value of -i if -xci is set. This - # can lead to blinking states. Silently reduce the -ci value to -i if this - # occurs. Fixes b707 b770 b912 b920 b930 b933 b939 b940 b941 b942 b978 - if ( $rOpts->{'continuation-indentation'} > $rOpts->{'indent-columns'} - && $rOpts->{'extended-continuation-indentation'} ) - { - $rOpts->{'continuation-indentation'} = $rOpts->{'indent-columns'}; - Warn(<{'line-up-parentheses'} ) { if ( $rOpts->{'indent-only'} diff --git a/local-docs/BugLog.pod b/local-docs/BugLog.pod index 5340f2bd..803f1354 100644 --- a/local-docs/BugLog.pod +++ b/local-docs/BugLog.pod @@ -2,11 +2,19 @@ =over 4 +=item B + +This update undoes the update c16c5ee of 20 Feb 2021, in which the value +of -ci=n was limited to the value of -i=n when -xci was set. Recent +improvements in stability tolerances allow this limit to be removed. + +28 Jun 2021. + =item B Added a quick check to bypass a needless sub call. -26 Jan 2021. +26 Jan 2021, e7822df. =item B @@ -14,7 +22,7 @@ It was possible to eliminate this token variable by changing the order of welding operations. This reduces the number of variables per token from 12 to 11. -26 Jun 2021. +26 Jun 2021, 1f4f78c. =item B @@ -23,7 +31,7 @@ effect on efficiency. This update reduces the number of token variables from 13 to 12, and also simplifies the coding. It was possible to compute this variable from the others, so it was redundant. -26 Jun 2021. +26 Jun 2021, 300ca1e. =back -- 2.39.5