aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2006-04-12 05:11:12 +0000
committerStefan Monnier2006-04-12 05:11:12 +0000
commit16a3b9b72cb7384be867dda93d9a6e71fd5e4847 (patch)
tree7b6ffb8cbcc5dd9c921de77ad69be7c241a03abf
parent7ab3cbbb246411ac2e8c12bc0761dbb66874c049 (diff)
downloademacs-16a3b9b72cb7384be867dda93d9a6e71fd5e4847.tar.gz
emacs-16a3b9b72cb7384be867dda93d9a6e71fd5e4847.zip
(perl-indent-new-calculate): Recompute parse-start after jumping backward by
a whole sexp.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/progmodes/perl-mode.el5
2 files changed, 9 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b7dcf022996..32b8304044f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12006-04-12 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * progmodes/perl-mode.el (perl-indent-new-calculate):
4 Recompute parse-start after jumping backward by a whole sexp.
5
12006-04-11 Stefan Monnier <monnier@iro.umontreal.ca> 62006-04-11 Stefan Monnier <monnier@iro.umontreal.ca>
2 7
3 * vc.el (vc-ensure-vc-buffer): Only change current-buffer, not the 8 * 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 b0e31bafc28..e92bb1053a6 100644
--- 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."
721 (save-excursion 721 (save-excursion
722 (forward-char 1) 722 (forward-char 1)
723 (forward-sexp -1) 723 (forward-sexp -1)
724 (perl-indent-new-calculate 'virtual nil parse-start))) 724 (perl-indent-new-calculate
725 ;; Recalculate the parsing-start, since we may have jumped
726 ;; dangerously close (typically in the case of nested functions).
727 'virtual nil (save-excursion (perl-beginning-of-function)))))
725 (and (and (= (following-char) ?{) 728 (and (and (= (following-char) ?{)
726 (save-excursion (forward-char) (perl-hanging-paren-p))) 729 (save-excursion (forward-char) (perl-hanging-paren-p)))
727 (+ (or default (perl-calculate-indent parse-start)) 730 (+ (or default (perl-calculate-indent parse-start))