From 08dc76c83cc7a3e8e60e55d2e9494ca57fad31e5 Mon Sep 17 00:00:00 2001 From: syl20bnr Date: Wed, 20 Nov 2013 22:49:19 -0500 Subject: [PATCH] Fix erlang/EDTS lazy loading --- init-extension/init-edts.el | 12 ------------ init-package/init-erlang.el | 9 ++++++--- 2 files changed, 6 insertions(+), 15 deletions(-) delete mode 100644 init-extension/init-edts.el diff --git a/init-extension/init-edts.el b/init-extension/init-edts.el deleted file mode 100644 index bd6fa62b8..000000000 --- a/init-extension/init-edts.el +++ /dev/null @@ -1,12 +0,0 @@ -(use-package edts - :init - (require 'edts-start) - :config - ;; (setq edts-log-level 'debug) - ;; inherits faces from flycheck - (custom-set-faces - '(edts-face-error-line ((t (:inherit flycheck-error-face)))) - '(edts-face-error-mode-line ((t (:inherit flycheck-error-face-mode-line)))) - '(edts-face-warning-line ((t (:inherit flycheck-warning-face)))) - '(edts-face-warning-mode-line ((t (:inherit flycheck-warning-face-mode-line)))) - )) diff --git a/init-package/init-erlang.el b/init-package/init-erlang.el index ea9f69f70..b4a896968 100644 --- a/init-package/init-erlang.el +++ b/init-package/init-erlang.el @@ -1,4 +1,4 @@ -(use-package erlang-mode +(use-package erlang :mode (("\\.erl?$" . erlang-mode) ("\\.hrl?$" . erlang-mode) ("\\.spec?$" . erlang-mode)) @@ -9,12 +9,15 @@ (setq erlang-man-root-dir "/usr/lib/erlang/erts-5.10.3/man") (setq erlang-compile-extra-opts '(debug_info)) (require 'erlang-start) - (add-hook 'erlang-mode-hook (lambda () ;; when starting an Erlang shell in Emacs, with a custom node name (setq inferior-erlang-machine-options '("-sname" "syl20bnr")) - )))) + )) + (require 'edts-start) + ;; (setq edts-log-level 'debug) + (setq edts-face-inhibit-mode-line-updates t) + )) ;; not needed using EDTS ;; (require 'erlang-flymake)