summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoah Misch2019-01-13 19:32:31 +0000
committerNoah Misch2019-01-13 19:32:31 +0000
commit472e1e4cf64b81b1ecae900db8115deb250ba8bc (patch)
tree8286d61f9f2528cb5fe9b455634017b5ba09aa67
parent52a301e0d95aa25aa9bbc0eefd1167458e3e0cab (diff)
Make Emacs perl-mode indent more like perltidy.
This especially helps braces that surround code blocks. Back-patch to v11, where commit 56fb890ace8ac0ca955ae0803c580c2074f876f6 first appeared; before that, settings were even more distant from perltidy. Reviewed by Andrew Dunstan. Discussion: https://postgr.es/m/[email protected]
-rw-r--r--.dir-locals.el2
-rw-r--r--src/tools/editors/emacs.samples5
2 files changed, 5 insertions, 2 deletions
diff --git a/.dir-locals.el b/.dir-locals.el
index eff4671ef8..ab6208b698 100644
--- a/.dir-locals.el
+++ b/.dir-locals.el
@@ -9,7 +9,7 @@
(indent-tabs-mode . nil)))
(perl-mode . ((perl-indent-level . 4)
(perl-continued-statement-offset . 2)
- (perl-continued-brace-offset . 4)
+ (perl-continued-brace-offset . -2)
(perl-brace-offset . 0)
(perl-brace-imaginary-offset . 0)
(perl-label-offset . -2)
diff --git a/src/tools/editors/emacs.samples b/src/tools/editors/emacs.samples
index a7152b04bc..529c98a9eb 100644
--- a/src/tools/editors/emacs.samples
+++ b/src/tools/editors/emacs.samples
@@ -47,10 +47,13 @@
(interactive)
(setq perl-brace-imaginary-offset 0)
(setq perl-brace-offset 0)
- (setq perl-continued-brace-offset 4)
(setq perl-continued-statement-offset 2)
+ (setq perl-continued-brace-offset (- perl-continued-statement-offset))
(setq perl-indent-level 4)
(setq perl-label-offset -2)
+ ;; Next two aren't marked safe-local-variable, so .dir-locals.el omits them.
+ (setq perl-indent-continued-arguments 4)
+ (setq perl-indent-parens-as-block t)
(setq indent-tabs-mode t)
(setq tab-width 4))