TakeV/spacemacs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

company-ess has been merged with ess

Browse source 
`company-ess` has been removed from melpa, it has been merged with
`ess`.

This is my suggestion for the fix.

Modifications as requested.
This commit is contained in:
Jean-Christophe Petkovich 2015-05-17 14:04:11 -04:00 committed by syl20bnr
parent 5b72221fe8
commit 248ddde176
1 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
contrib/lang/ess/packages.el
View file

@ -13,7 +13,6 @@
(setq ess-packages
'(
company
company-ess
ess
ess-R-data-view
ess-R-object-popup
@ -81,7 +80,10 @@ not play nicely with autoloads"
SAS-mode STA-mode Snw-mode XLS-mode ess-bugs-mode ess-jags-mode omegahat-mode)
"This is the list of modes defined by ess")
(mapc (lambda (sym) (ess/auto-load-hack sym)) ess/r-modes-list)))
(mapc (lambda (sym) (ess/auto-load-hack sym)) ess/r-modes-list)
(push 'company-R-objects company-backends-ess-mode)
(push 'company-R-args company-backends-ess-mode)))
;; R --------------------------------------------------------------------------
(eval-after-load "ess-site"
@ -138,13 +140,5 @@ not play nicely with autoloads"
(add-hook 'ess-mode-hook 'ess-smart-equals-mode)
(add-hook 'inferior-ess-mode-hook 'ess-smart-equals-mode))))
(when (configuration-layer/layer-usedp 'auto-completion)
(defun ess/post-init-company ()
(spacemacs|add-company-hook ess-mode))
(defun ess/init-company-ess ()
(use-package company-ess
:if (configuration-layer/package-usedp 'company)
:defer t
:init
(push 'company-ess-backend company-backends-ess-mode))))
(defun ess/post-init-company ()
(spacemacs|add-company-hook ess-mode))