diff options
| author | Sverker Eriksson <[email protected]> | 2016-10-05 16:11:31 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2016-10-05 16:11:31 +0200 |
| commit | 502ed5fd6bd36328d6be63c68ee2a56738ced058 (patch) | |
| tree | 80cfb83dd63ffa876541740cc067ea05bb39118d /lib/tools/emacs/erlang.el | |
| parent | cf102c1b1225450e7918a6119b7d949eb7e575c4 (diff) | |
| parent | 0bac72a18e8a5f6a46baae9c9ac73bde32948ff6 (diff) | |
| download | otp-502ed5fd6bd36328d6be63c68ee2a56738ced058.tar.gz otp-502ed5fd6bd36328d6be63c68ee2a56738ced058.tar.bz2 otp-502ed5fd6bd36328d6be63c68ee2a56738ced058.zip | |
Merge branch 'master' into sverker/master/load_nif-print-init-error
Diffstat (limited to 'lib/tools/emacs/erlang.el')
| -rw-r--r-- | lib/tools/emacs/erlang.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/tools/emacs/erlang.el b/lib/tools/emacs/erlang.el index 73c6b8d768..b3dda32928 100644 --- a/lib/tools/emacs/erlang.el +++ b/lib/tools/emacs/erlang.el @@ -743,6 +743,7 @@ resulting regexp is surrounded by \\_< and \\_>." "bitsize" "bitstring_to_list" "byte_size" + "ceil" "check_old_code" "check_process_code" "date" @@ -753,6 +754,7 @@ resulting regexp is surrounded by \\_< and \\_>." "erase" "error" "exit" + "floor" "float" "float_to_binary" "float_to_list" @@ -1512,8 +1514,6 @@ Other commands: (setq paragraph-separate paragraph-start) (make-local-variable 'paragraph-ignore-fill-prefix) (setq paragraph-ignore-fill-prefix t) - (make-local-variable 'require-final-newline) - (setq require-final-newline t) (make-local-variable 'defun-prompt-regexp) (setq defun-prompt-regexp erlang-defun-prompt-regexp) (make-local-variable 'comment-start) |