[Emacs-diffs] emacs-24 r116972: * lisp/progmodes/perl-mode.el (perl-calculate-indent): Don't auto-indent in

[Stefan Monnier]

------------------------------------------------------------
revno: 116972
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=17262
committer: Stefan Monnier <address@hidden>
branch nick: emacs-24
timestamp: Wed 2014-04-16 10:13:06 -0400
message:
  * lisp/progmodes/perl-mode.el (perl-calculate-indent): Don't auto-indent in
  here-documents.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/progmodes/perl-mode.el    perlmode.el-20091113204419-o5vbwnq5f7feedwu-402

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-04-16 13:27:28 +0000
+++ b/lisp/ChangeLog    2014-04-16 14:13:06 +0000
@@ -1,7 +1,12 @@
+2014-04-16  Stefan Monnier  <address@hidden>
+
+       * progmodes/perl-mode.el (perl-calculate-indent): Don't auto-indent in
+       here-documents (bug#17262).
+
 2014-04-16  Eli Zaretskii  <address@hidden>
 
-       * term/pc-win.el (x-list-fonts, x-get-selection-value): Provide
-       doc strings, as required by snarf-documentation.
+       * term/pc-win.el (x-list-fonts, x-get-selection-value):
+       Provide doc strings, as required by snarf-documentation.
 
 2014-04-15  Stefan Monnier  <address@hidden>
 

=== modified file 'lisp/progmodes/perl-mode.el'
--- a/lisp/progmodes/perl-mode.el       2014-04-03 00:41:09 +0000
+++ b/lisp/progmodes/perl-mode.el       2014-04-16 14:13:06 +0000
@@ -903,7 +903,9 @@
        ;;          following_quotep minimum_paren-depth_this_scan)
        ;; Parsing stops if depth in parentheses becomes equal to third arg.
        (setq containing-sexp (nth 1 state)))
-      (cond ((nth 3 state) 'noindent)  ; In a quoted string?
+      (cond
+       ;; Don't auto-indent in a quoted string or a here-document.
+       ((or (nth 3 state) (eq 2 (nth 7 state))) 'noindent)
            ((null containing-sexp)     ; Line is at top level.
             (skip-chars-forward " \t\f")
             (if (memq (following-char)