From dde0cfd35a6408763c989f976d8acd7ab1300157 Mon Sep 17 00:00:00 2001 From: Adam Beckmeyer Date: Wed, 14 Mar 2018 22:06:45 -0400 Subject: [PATCH] Move use of ess with julia to julia layer --- layers/+lang/ess/packages.el | 2 -- layers/+lang/julia/funcs.el | 2 +- layers/+lang/julia/packages.el | 4 ++++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/layers/+lang/ess/packages.el b/layers/+lang/ess/packages.el index ad728d22afd2..1fe8e41eaa7e 100644 --- a/layers/+lang/ess/packages.el +++ b/layers/+lang/ess/packages.el @@ -36,7 +36,6 @@ ("\\.do\\'" . STA-mode) ("\\.ado\\'" . STA-mode) ("\\.[Ss][Aa][Ss]\\'" . SAS-mode) - ("\\.jl\\'" . ess-julia-mode) ("\\.[Ss]t\\'" . S-transcript-mode) ("\\.Sout" . S-transcript-mode) ("\\.[Rr]out" . R-transcript-mode) @@ -50,7 +49,6 @@ :commands (R stata julia SAS) :init (progn - (spacemacs/register-repl 'ess-site 'julia) (spacemacs/register-repl 'ess-site 'R) (spacemacs/register-repl 'ess-site 'SAS) (spacemacs/register-repl 'ess-site 'stata) diff --git a/layers/+lang/julia/funcs.el b/layers/+lang/julia/funcs.el index 7b696b7d2fc1..8f86db5c5c61 100644 --- a/layers/+lang/julia/funcs.el +++ b/layers/+lang/julia/funcs.el @@ -22,7 +22,7 @@ (julia-repl-mode)) (defun spacemacs//julia-setup-ess () - nil) + (add-to-list auto-mode-alist ("\\.jl\\'" . ess-julia-mode))) (defun spacemacs//julia-setup-lsp () "Start lsp-mode and configure for buffer." diff --git a/layers/+lang/julia/packages.el b/layers/+lang/julia/packages.el index 03a1cf535aa1..54223db3daba 100644 --- a/layers/+lang/julia/packages.el +++ b/layers/+lang/julia/packages.el @@ -17,6 +17,7 @@ :repo "non-Jedi/lsp-julia")) flycheck company-lsp + ess )) (defun julia/init-julia-mode () @@ -88,4 +89,7 @@ (defun julia/post-init-flycheck () (spacemacs/enable-flycheck 'julia-mode)) + +(defun julia/post-init-ess () + (spacemacs/register-repl 'ess-site 'julia)) ;;; packages.el ends here