(perl-indent-new-calculate): Recompute parse-start after jumping backward by

a whole sexp.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b7dcf0229966ac9bff7eca2ca71112f92fd77a25..32b8304044fb23d7b83a25981f730bc19e23e5d7 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-12  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * progmodes/perl-mode.el (perl-indent-new-calculate):
+       Recompute parse-start after jumping backward by a whole sexp.
+
 2006-04-11  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * vc.el (vc-ensure-vc-buffer): Only change current-buffer, not the

diff --git a/lisp/progmodes/perl-mode.el b/lisp/progmodes/perl-mode.el
index b0e31bafc289504b0b9bb29963f288a5dcbb1167..e92bb1053a6541a5774a91f6ead5eb0643ca55e4 100644 (file)
--- a/lisp/progmodes/perl-mode.el
+++ b/lisp/progmodes/perl-mode.el
@@ -721,7 +721,10 @@ changed by, or (parse-state) if line starts in a quoted string."
        (save-excursion
          (forward-char 1)
          (forward-sexp -1)
-         (perl-indent-new-calculate 'virtual nil parse-start)))
+         (perl-indent-new-calculate
+           ;; Recalculate the parsing-start, since we may have jumped
+           ;; dangerously close (typically in the case of nested functions).
+           'virtual nil (save-excursion (perl-beginning-of-function)))))
    (and (and (= (following-char) ?{)
             (save-excursion (forward-char) (perl-hanging-paren-p)))
        (+ (or default (perl-calculate-indent parse-start))