From c20cb2554b9f780c7ed074e5d59fb6be66fea547 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Fri, 10 Oct 2014 03:34:38 -0400 Subject: [PATCH] Add cmake-mode --- Cask | 3 ++- init/init-cpp.el | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Cask b/Cask index 1b70ed115..d80b5f673 100644 --- a/Cask +++ b/Cask @@ -89,7 +89,7 @@ (depends-on "jedi") -(depends-on "omnisharp") +;;(depends-on "omnisharp") (depends-on "csharp-mode") (depends-on "emacs-eclim") @@ -99,3 +99,4 @@ (depends-on "gitignore-mode") (depends-on "applescript-mode") +(depends-on "cmake-mode") diff --git a/init/init-cpp.el b/init/init-cpp.el index 96d9288b4..c75e4a6e6 100644 --- a/init/init-cpp.el +++ b/init/init-cpp.el @@ -1,5 +1,9 @@ (provide 'init-cpp) +(use-package cmake-mode + :mode "CMakeLists\\.txt$" + :config (add-to-list 'ac-modes 'cmake-mode)) + (setq-default c-basic-offset 4 c-default-style "linux" c-tab-always-indent nil) @@ -117,6 +121,7 @@ 0 ; no additional indent ad-do-it))) ; default behavior +;; Shaders (use-package glsl-mode :mode (("\\.glsl\\'" . glsl-mode) ("\\.vert\\'" . glsl-mode)