diff options
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | init.el | 4 | ||||
| -rw-r--r-- | lisp/cpp.el | 7 |
3 files changed, 9 insertions, 5 deletions
@@ -1,5 +1,6 @@ elpa projectile-bookmarks.eld +irony auto-save-list *.~ -projects
\ No newline at end of file +projects @@ -14,7 +14,7 @@ (setq package-list - '(tide auctex evil js2-highlight-vars ac-js2 js2-refactor js2-mode flycheck-irony company-irony all-the-icons req-package projectile irony org web-mode)) + '(tide auctex evil js2-highlight-vars ac-js2 js2-refactor js2-mode flycheck-irony company-irony all-the-icons req-package projectile irony org web-mode cmake-mode rtags)) ; fetch the list of packages available (unless package-archive-contents @@ -74,7 +74,7 @@ '(org-agenda-files (list org-directory)) '(org-directory "~/Documents/org") '(package-selected-packages - '(tide auctex evil js2-highlight-vars ac-js2 js2-refactor js2-mode flycheck-irony company-irony all-the-icons req-package projectile irony org))) + '(rtags cmake-ide cmake-mode tide auctex evil js2-highlight-vars ac-js2 js2-refactor js2-mode flycheck-irony company-irony all-the-icons req-package projectile irony org))) (custom-set-faces ;; custom-set-faces was added by Custom. ;; If you edit it by hand, you could mess it up, so be careful. diff --git a/lisp/cpp.el b/lisp/cpp.el index 0fca237..77ca740 100644 --- a/lisp/cpp.el +++ b/lisp/cpp.el @@ -4,10 +4,10 @@ (setq c-indent-level 4) ;; Default is 2 (c-set-offset 'brace-list-open 0) - (setq tab-stop-list '(4 8 12 16 20 24 28 32 36 40 44 48 52 56 60)) (setq tab-width 4) - (electric-indent-mode 0) + (cmake-ide-setup) + ;; (electric-indent-mode 0) ) ;; == irony-mode == @@ -51,4 +51,7 @@ (eval-after-load 'flycheck '(add-hook 'flycheck-mode-hook #'flycheck-irony-setup)) +(require 'cmake-ide) + (provide 'cpp) + |