Make Emacs settings match perltidy configuration

Set Emacs's perl-continued-statement-offset to match perltidy's
--continuation-indentation, which is 2 (not overridden in PostgreSQL's
profile) rather than the 4 that Emacs uses by default.

diff --git a/.dir-locals.el b/.dir-locals.el
index d8827a669a4dbe041ccc4ac3075a6883290bf4ba..9525d6b60494592f8e7879822946906ce9019e24 100644 (file)
--- a/.dir-locals.el
+++ b/.dir-locals.el
@@ -8,7 +8,7 @@
  (dsssl-mode . ((indent-tabs-mode . nil)))
  (nxml-mode . ((indent-tabs-mode . nil)))
  (perl-mode . ((perl-indent-level . 4)
-               (perl-continued-statement-offset . 4)
+               (perl-continued-statement-offset . 2)
                (perl-continued-brace-offset . 4)
                (perl-brace-offset . 0)
                (perl-brace-imaginary-offset . 0)

diff --git a/src/tools/editors/emacs.samples b/src/tools/editors/emacs.samples
index d9cd47cef2710f5610d6c9a0722d75907da6aebf..5f08c71dd18af41537a319cb1b87e563c334a201 100644 (file)
--- a/src/tools/editors/emacs.samples
+++ b/src/tools/editors/emacs.samples
@@ -48,7 +48,7 @@
   (setq perl-brace-imaginary-offset 0)
   (setq perl-brace-offset 0)
   (setq perl-continued-brace-offset 4)
-  (setq perl-continued-statement-offset 4)
+  (setq perl-continued-statement-offset 2)
   (setq perl-indent-level 4)
   (setq perl-label-offset -2)
   (setq indent-tabs-mode t)