fix b1466

diff --git a/dev-bin/run_convergence_tests.pl.expect b/dev-bin/run_convergence_tests.pl.expect
index 6f91b8a1d3fbbcf728917e6650798d1e391b8b85..aaed1ca147cbdf012029b585e18fe4def9205443 100644 (file)
--- a/dev-bin/run_convergence_tests.pl.expect
+++ b/dev-bin/run_convergence_tests.pl.expect
@@ -6508,7 +6508,8 @@ my $parser =
 ==> b1325 <==
 WriteMakefile(
    PREREQ_PM    => {
-      'Tk'            =>'800.025',
+      'Tk'            =>
+            '800.025',
       'Tk::DiffText'  => 0,
       'Perl::Tidy'    => 0
       , # comes in the perltidy application
@@ -6520,7 +6521,8 @@ WriteMakefile(
 
 WriteMakefile(
    PREREQ_PM    => {
-      'Tk'            =>'800.025',
+      'Tk'            =>
+            '800.025',
       'Tk::DiffText'  => 0,
       'Perl::Tidy'    => 0
       , # comes in the perltidy application
@@ -8104,8 +8106,8 @@ sub new{
                               while(($k,$v,)=each(%{$_[3]})){
                                    if($k eq"email_"){
                                         if(
-                                                 defined$groups{$_[1]}
-                                                 ->{"email_work"})
+                                                   defined$groups{$_[1]}
+                                                   ->{"email_work"})
                                         {
                                              $k="email_home";
                                         }

diff --git a/lib/Perl/Tidy/Formatter.pm b/lib/Perl/Tidy/Formatter.pm
index 9d7b195767df0d81c5422635a4aff65745128b32..ff70cc5690c15f8be6fa72001d25861d262cee0c 100644 (file)
--- a/lib/Perl/Tidy/Formatter.pm
+++ b/lib/Perl/Tidy/Formatter.pm
@@ -2874,7 +2874,10 @@ EOM
     #-----------------------------------------------------------
     # The combination -xlp -xci and ci>i can be unstable (b1466)
     #-----------------------------------------------------------
-    if (   $rOpts->{'extended-line-up-parentheses'}
+    # Deactivated: the fix for b1501 also fixed b1466 in a simpler way.
+    # So this block can eventually be removed.
+    if (   0
+        && $rOpts->{'extended-line-up-parentheses'}
         && $rOpts->{'extended-continuation-indentation'}
         && $rOpts->{'continuation-indentation'} > $rOpts->{'indent-columns'}
         && $rOpts->{'indent-columns'} > 1 )