emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

General cleanup (again)

Browse source
This commit is contained in:
Henrik Lissner 2016-03-29 23:13:31 -04:00
parent 53c94b8273
commit f9f0b9a2e4
11 changed files with 84 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

23
modules/module-cc.el
View file

@ -3,9 +3,8 @@
(use-package cmake-mode
:mode "CMakeLists\\.txt$"
:config
(after! company
(require 'company-cmake)
(define-company-backend! cmake-mode (cmake yasnippet))))
(require 'company-cmake)
(define-company-backend! cmake-mode (cmake yasnippet)))
(use-package glsl-mode
:mode ("\\.glsl\\'" "\\.vert\\'" "\\.frag\\'" "\\.geom\\'"))
@ -43,6 +42,10 @@
(sp-local-pair "/**" "*/" :post-handlers '(("||\n[i]" "RET") ("||\n[i]" "SPC")))
(sp-local-pair "/*!" "*/" :post-handlers '(("||\n[i]" "RET") ("[d-1]< | " "SPC"))))
;; TODO Clang is *really* slow in larger projects, maybe replace it with
;; irony-mode or ycmd?
(define-company-backend! c-mode-common (c-headers clang xcode))
;; C/C++ Settings
(add-hook! (c-mode c++-mode)
(electric-indent-local-mode +1)
@ -50,11 +53,10 @@
(add-hook! c++-mode 'narf|init-c++-C11-highlights)
(when IS-MAC
(after! company
(setq-default company-c-headers-path-system
(append '("/usr/include/" "/usr/local/include")
(f-directories "/usr/include/c++/")
(f-directories "/usr/local/include/c++/"))))
(setq-default company-c-headers-path-system
(append '("/usr/include/" "/usr/local/include")
(f-directories "/usr/include/c++/")
(f-directories "/usr/local/include/c++/")))
(after! flycheck
(setq-default flycheck-clang-include-path '("/usr/local/include")
flycheck-gcc-include-path '("/usr/local/include"))))
@ -63,11 +65,6 @@
(add-hook! c++-mode (setq flycheck-clang-language-standard "c++11"
flycheck-clang-standard-library "libc++")))
(after! company
;; TODO Clang is *really* slow in larger projects, maybe replace it with
;; irony-mode or ycmd?
(define-company-backend! c-mode-common (c-headers clang xcode)))
;; Fix enum and C++11 lambda indentation
(defadvice c-lineup-arglist (around c-lineup-arglist-indent-fix activate)
"Improve indentation of continued C++11 lambda function opened as argument."