diff options
| author | Niclas Axelsson <[email protected]> | 2011-03-09 18:00:22 +0100 |
|---|---|---|
| committer | Niclas Axelsson <[email protected]> | 2011-03-09 18:00:27 +0100 |
| commit | 8533b8bcae728783b1c066b9fecb96b1cc2eb03c (patch) | |
| tree | c6c1dbc8661475e4ecd4357a0606ac1da956e51d /lib/tools | |
| parent | 4668c233c8f850eb5c3e04e760b25d34b73aa497 (diff) | |
| parent | ebbcdf5d18e17d7c6a7a7b0c80a85663927d6676 (diff) | |
| download | otp-8533b8bcae728783b1c066b9fecb96b1cc2eb03c.tar.gz otp-8533b8bcae728783b1c066b9fecb96b1cc2eb03c.tar.bz2 otp-8533b8bcae728783b1c066b9fecb96b1cc2eb03c.zip | |
Merge branch 'mh/emacs-indent-variables-are-safe' into dev
* mh/emacs-indent-variables-are-safe:
Declare indentation options as "safe" in erlang-mode for Emacs
OTP-9122
Diffstat (limited to 'lib/tools')
| -rw-r--r-- | lib/tools/emacs/erlang.el | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/tools/emacs/erlang.el b/lib/tools/emacs/erlang.el index ed825a298f..17b093ee34 100644 --- a/lib/tools/emacs/erlang.el +++ b/lib/tools/emacs/erlang.el @@ -466,14 +466,17 @@ To activate the workaround, place the following in your `~/.emacs' file: (defvar erlang-indent-level 4 "*Indentation of Erlang calls/clauses within blocks.") +(put 'erlang-indent-level 'safe-local-variable 'integerp) (defvar erlang-indent-guard 2 "*Indentation of Erlang guards.") +(put 'erlang-indent-guard 'safe-local-variable 'integerp) (defvar erlang-argument-indent 2 "*Indentation of the first argument in a function call. When nil, indent to the column after the `(' of the function.") +(put 'erlang-argument-indent 'safe-local-variable '(lambda (val) (or (null val) (integerp val)))) (defvar erlang-tab-always-indent t "*Non-nil means TAB in Erlang mode should always re-indent the current line, |