[Emacs-diffs] /srv/bzr/emacs/trunk r111349: * lisp/progmodes/cperl-mode.el (cperl-calculate-indent): Do not stagger

[Sam Steingold]

------------------------------------------------------------
revno: 111349
committer: Sam Steingold <address@hidden>
branch nick: trunk
timestamp: Thu 2012-12-27 11:33:06 -0500
message:
  * lisp/progmodes/cperl-mode.el (cperl-calculate-indent): Do not stagger
  continuations, see <http://stackoverflow.com/questions/3582436>.
modified:
  lisp/ChangeLog
  lisp/progmodes/cperl-mode.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-12-27 08:21:08 +0000
+++ b/lisp/ChangeLog    2012-12-27 16:33:06 +0000
@@ -1,8 +1,13 @@
+2012-12-27  Sam Steingold  <address@hidden>
+
+       * progmodes/cperl-mode.el (cperl-calculate-indent): Do not stagger
+       continuations, see <http://stackoverflow.com/questions/3582436>.
+
 2012-12-27  Dmitry Gutov  <address@hidden>
 
        * progmodes/ruby-mode.el (ruby-indent-beg-re): Only allow "class",
        "module" and "def" to have indentation before them.  Regression
-       from 109911 (see the new test).
+       from Bug#109911 (see the new test).
 
        * progmodes/ruby-mode.el: Bump the version to 1.2 (Bug#13200).
 

=== modified file 'lisp/progmodes/cperl-mode.el'
--- a/lisp/progmodes/cperl-mode.el      2012-12-01 05:09:12 +0000
+++ b/lisp/progmodes/cperl-mode.el      2012-12-27 16:33:06 +0000
@@ -3120,8 +3120,10 @@
         ((eq 'continuation (elt i 0))
          ;; [continuation statement-start char-after is-block is-brace]
          (goto-char (elt i 1))         ; statement-start
-         (+ (if (memq (elt i 2) (append "}])" nil)) ; char-after
-                0                      ; Closing parenth
+         (+ (if (or (memq (elt i 2) (append "}])" nil)) ; char-after
+                     (eq 'continuation ; do not stagger continuations
+                         (elt (cperl-sniff-for-indent parse-data) 0)))
+                0 ; Closing parenth or continuation of a continuation
               cperl-continued-statement-offset)
             (if (or (elt i 3)          ; is-block
                     (not (elt i 4))            ; is-brace