procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* lisp/progmodes/perl-mode.el (perl-calculate-indent): Don't auto-indent in

Browse source 
here-documents.

Fixes: debbugs:17262
This commit is contained in:
Stefan Monnier 2014-04-16 10:13:06 -04:00
parent 63032a0eb9
commit c76a7a5cd2
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lisp/ChangeLog
View file

@ -1,7 +1,12 @@
2014-04-16 Stefan Monnier <monnier@iro.umontreal.ca>
* progmodes/perl-mode.el (perl-calculate-indent): Don't auto-indent in
here-documents (bug#17262).
2014-04-16 Eli Zaretskii <eliz@gnu.org>
* 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 <monnier@iro.umontreal.ca>

4
lisp/progmodes/perl-mode.el
View file

@ -903,7 +903,9 @@ Optional argument PARSE-START should be the position of `beginning-of-defun'."
;; 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)