|
@@ -101,7 +101,6 @@
|
|
|
:mode "\\.scala\\'")
|
|
:mode "\\.scala\\'")
|
|
|
|
|
|
|
|
(use-package ensime
|
|
(use-package ensime
|
|
|
- :disabled
|
|
|
|
|
:if (version<= "24.4" emacs-version)
|
|
:if (version<= "24.4" emacs-version)
|
|
|
:pin melpa-stable)
|
|
:pin melpa-stable)
|
|
|
|
|
|
|
@@ -110,6 +109,13 @@
|
|
|
:hook c-mode
|
|
:hook c-mode
|
|
|
:mode ("\\.c\\'" "\\.h\\'"))
|
|
:mode ("\\.c\\'" "\\.h\\'"))
|
|
|
|
|
|
|
|
|
|
+(use-package auto-complete)
|
|
|
|
|
+
|
|
|
|
|
+(use-package auto-complete-clang-async
|
|
|
|
|
+ :requires auto-complete
|
|
|
|
|
+ :hook c-mode
|
|
|
|
|
+ :mode ("\\.c\\'" "\\.h\\'"))
|
|
|
|
|
+
|
|
|
;; ------------ Web Mode ------------
|
|
;; ------------ Web Mode ------------
|
|
|
(use-package multi-web-mode
|
|
(use-package multi-web-mode
|
|
|
:init
|
|
:init
|
|
@@ -225,7 +231,7 @@
|
|
|
;; If there is more than one, they won't work right.
|
|
;; If there is more than one, they won't work right.
|
|
|
'(package-selected-packages
|
|
'(package-selected-packages
|
|
|
(quote
|
|
(quote
|
|
|
- (xclip hl-todo comment-tags restclient markdown-mode autopair highlight-parentheses flyspell-correct-popup rust-mode rust-playground slime-volleyball use-package multi-web-mode magit ensime color-theme base16-theme))))
|
|
|
|
|
|
|
+ (auto-complete auto-complete-clang-async xclip hl-todo comment-tags restclient markdown-mode autopair highlight-parentheses flyspell-correct-popup rust-mode rust-playground slime-volleyball use-package multi-web-mode magit ensime color-theme base16-theme))))
|
|
|
(custom-set-faces
|
|
(custom-set-faces
|
|
|
;; custom-set-faces was added by Custom.
|
|
;; custom-set-faces was added by Custom.
|
|
|
;; If you edit it by hand, you could mess it up, so be careful.
|
|
;; If you edit it by hand, you could mess it up, so be careful.
|