diff --git a/modules/module-java.el b/modules/module-java.el index 769c01652..765b77671 100644 --- a/modules/module-java.el +++ b/modules/module-java.el @@ -20,10 +20,9 @@ (setq help-at-pt-timer-delay 0.1) (help-at-pt-set-timer) - (after! company - (use-package company-emacs-eclim - :functions company-emacs-eclim-setup - :config (company-emacs-eclim-setup))) + (use-package company-emacs-eclim + :functions company-emacs-eclim-setup + :config (company-emacs-eclim-setup)) (map! :map java-mode-map :m "gd" 'eclim-java-find-declaration)) diff --git a/modules/module-js.el b/modules/module-js.el index 2cb11575c..0de5e9413 100644 --- a/modules/module-js.el +++ b/modules/module-js.el @@ -88,9 +88,8 @@ :commands tern-mode :init (add-hook! js2-mode 'tern-mode) :config - (after! company - (require 'company-tern) - (define-company-backend! js2-mode (tern)))) + (require 'company-tern) + (define-company-backend! js2-mode (tern))) (use-package unityjs-mode :mode "/Assets/.*\\.js$" diff --git a/modules/module-php.el b/modules/module-php.el index a32701dcc..3535ddd45 100644 --- a/modules/module-php.el +++ b/modules/module-php.el @@ -64,9 +64,6 @@ :config (evil-set-initial-state 'php-boris-mode 'emacs)) -;; Support for Facebook's version of PHP -(use-package hack-mode :mode "\\.hh$") - (define-minor-mode php-laravel-mode "" :init-value nil diff --git a/modules/module-python.el b/modules/module-python.el index a85763470..16cb3936d 100644 --- a/modules/module-python.el +++ b/modules/module-python.el @@ -51,9 +51,8 @@ (advice-add 'anaconda-mode-doc-buffer :after 'narf*anaconda-mode-doc-buffer) - (after! company - (require 'company-anaconda) - (define-company-backend! python-mode (anaconda))) + (require 'company-anaconda) + (define-company-backend! python-mode (anaconda)) (after! emr (mapc (lambda (x) (let ((command-name (car x)) diff --git a/modules/module-ruby.el b/modules/module-ruby.el index cde0591fb..00fc662cf 100644 --- a/modules/module-ruby.el +++ b/modules/module-ruby.el @@ -90,9 +90,8 @@ (define-repl! ruby-mode inf-ruby) :config (evil-set-initial-state 'inf-ruby-mode 'emacs) - (after! company - (require 'company-inf-ruby) - (define-company-backend! inf-ruby-mode (inf-ruby)))) + (require 'company-inf-ruby) + (define-company-backend! inf-ruby-mode (inf-ruby))) (use-package robe :commands (robe-mode robe-start ruby-load-file) @@ -101,9 +100,8 @@ (narf|ruby-load-file) (add-hook 'after-save-hook 'narf|ruby-load-file nil t)) :config - (after! company - (require 'company-robe) - (define-company-backend! ruby-mode (robe)))) + (require 'company-robe) + (define-company-backend! ruby-mode (robe))) (provide 'module-ruby) ;;; module-ruby.el ends here