Re: master bd86a6c4fde: perl-mode.el: Improve indent after hanging open-paren

Re: master bd86a6c4fde: perl-mode.el: Improve indent after hanging open-paren

[Andrea Corallo]

Stefan Monnier via Mailing list for Emacs changes <emacs-diffs@gnu.org>
writes:

> branch: master
> commit bd86a6c4fde1aa42ea9e8b5434f0cb63f8d52684
> Author: Stefan Monnier <monnier@iro.umontreal.ca>
> Commit: Stefan Monnier <monnier@iro.umontreal.ca>
>
>     perl-mode.el: Improve indent after hanging open-paren
>     
>     Make the indentation of the code right after an open paren/brace
>     use the same rule as already used to indent the corresponding
>     matching paren/brace.
>     
>     * lisp/progmodes/perl-mode.el (perl-calculate-indent):
>     Use `perl-indent-new-calculate`s "virtual" indentation instead of
>     approximating it with `current-indentation`.

[...]

Hello :)

I see this is regressing cperl-test-bug-64364 here on my testbench on
master.

  Andrea

Re: master bd86a6c4fde: perl-mode.el: Improve indent after hanging open-paren

[Pip Cet]

[-- Attachment #1: Type: text/plain, Size: 1086 bytes --]

> On Friday, July 5th, 2024 at 14:02, Stefan Monnier via Mailing list for Emacs changes emacs-diffs@gnu.org wrote:
> 
> > branch: master
> > commit bd86a6c4fde1aa42ea9e8b5434f0cb63f8d52684
> > Author: Stefan Monnier monnier@iro.umontreal.ca
> > 
> > Commit: Stefan Monnier monnier@iro.umontreal.ca
> > 
> > perl-mode.el: Improve indent after hanging open-paren
> > 
> > Make the indentation of the code right after an open paren/brace
> > use the same rule as already used to indent the corresponding
> > matching paren/brace.
> > 
> > * lisp/progmodes/perl-mode.el (perl-calculate-indent):
> > Use `perl-indent-new-calculate`s "virtual" indentation instead of
> > approximating it with `current-indentation`.

Sorry, I sent this to Stefan but not to emacs-devel... 

Is it possible this causes a test failure in cperl-test-bug-64364? It does appear to do so here, and the new indentation behavior seems weird to me (though I'm not using Perl much anymore, so maybe this is the New Way).
 
I believe the attached patch might restore the intended behavior...

Pip

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-perl-indent.patch --]
[-- Type: text/x-patch; name=0001-perl-indent.patch, Size: 746 bytes --]

diff --git a/lisp/progmodes/perl-mode.el b/lisp/progmodes/perl-mode.el
index ff71970d41b..13d5d7f9451 100644
--- a/lisp/progmodes/perl-mode.el
+++ b/lisp/progmodes/perl-mode.el
@@ -1128,8 +1128,8 @@ perl-calculate-indent
             ;; Move back over whitespace before the openbrace.
             ;; If openbrace is not first nonwhite thing on the line,
             ;; add the perl-brace-imaginary-offset.
-            (progn (skip-chars-backward " \t")
-                   (if (bolp) 0 perl-brace-imaginary-offset))
+            (save-excursion (skip-chars-backward " \t")
+                            (if (bolp) 0 perl-brace-imaginary-offset))
             (perl-indent-new-calculate 'virtual))))))))
 
 (defun perl-backward-to-noncomment ()

Re: master bd86a6c4fde: perl-mode.el: Improve indent after hanging open-paren

[Stefan Monnier]

> I believe the attached patch might restore the intended behavior...

Indeed, thanks!
Can you push it to `master` or should I?


        Stefan