summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rw-r--r--lisp/cpp.el2
-rw-r--r--lisp/general.el1
3 files changed, 3 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index b1c0833..d36154d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,5 @@ irony
auto-save-list
*.~
projects
+.emacs.desktop
.mc-lists.el
diff --git a/lisp/cpp.el b/lisp/cpp.el
index 4b42382..dd32022 100644
--- a/lisp/cpp.el
+++ b/lisp/cpp.el
@@ -9,7 +9,6 @@
(setq tab-stop-list '(4 8 12 16 20 24 28 32 36 40 44 48 52 56 60))
(setq tab-width 4)
- (cmake-ide-setup)
;; (electric-indent-mode 0)
)
@@ -34,5 +33,6 @@
)
(require 'cmake-ide)
+(cmake-ide-setup)
(provide 'cpp)
diff --git a/lisp/general.el b/lisp/general.el
index b7841fd..9e8586a 100644
--- a/lisp/general.el
+++ b/lisp/general.el
@@ -36,6 +36,7 @@
(setq inhibit-splash-screen t)
(setq initial-scratch-message "")
(setq initial-major-mode 'text-mode)
+ (desktop-save-mode 1)
;; Projectile for projects
(require 'projectile)