Indentation, fixing edconfigpath

slipset · Aug 5, 2015 · e2e6ab9 · e2e6ab9
1 parent 0b2ea28
commit e2e6ab9
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 44 deletions.
diff --git a/elisp/slipset-osx.el b/elisp/slipset-osx.el
@@ -7,6 +7,6 @@
 (setq slipset-eclim-eclipse-dirs '("/Applications/eclipse"))
 
 (setq slipset-font-family "Monaco")
-
+(setq slipset-edconf-exec-path "/usr/local/bin/editorconfig")
 
 (provide 'slipset-osx)
diff --git a/elisp/slipset-windows-nt.el b/elisp/slipset-windows-nt.el
@@ -2,6 +2,6 @@
 
 (setq slipset-eclim-executable "C:/dev/eclipse/eclipse/eclim.bat")
 (setq slipset-eclim-eclipse-dirs '("C:/dev/eclipse/eclipse"))
-
+(setq slipset-edconf-exec-path "C:\\Program Files (x86)\\editorconfig\\bin\\editorconfig")
 (setq slipset-font-family "Consolas")
 
diff --git a/init.el b/init.el
@@ -4,34 +4,33 @@
 
 (setq init-home-dir (file-name-directory user-init-file))
 (setq package-archives '(("gnu" . "http://elpa.gnu.org/packages/")
-												 ("melpa" . "http://melpa.org/packages/")))
+			 ("melpa" . "http://melpa.org/packages/")))
 (add-to-list 'load-path
-						 (expand-file-name "elisp" init-home-dir))
+	     (expand-file-name "elisp" init-home-dir))
 
 (require 'slipset-funs)
 (require 'ensure-packages)
 
-(setq ensure-packages
-      '(projectile simple-httpd flymake-jslint
-									 flymake-cursor git kite magit
-									 smart-tabs-mode js2-mode git-gutter-fringe
-									 twittering-mode
-									 auto-complete
-									 clojure-mode cider
-									 markdown-mode
-									 auto-complete
-									 yasnippet
-									 purty-mode
-									 sbt-mode
-									 ensime
-									 jabber
-									 emacs-eclim
-									 atom-dark-theme
-									 editorconfig
-									 rcirc
-									 diminish
-									 paredit-menu
-									 clojure-snippets))
+(setq ensure-packages '(projectile simple-httpd flymake-jslint
+				   flymake-cursor git kite magit
+				   smart-tabs-mode js2-mode git-gutter-fringe
+				   twittering-mode
+				   auto-complete
+				   clojure-mode cider
+				   markdown-mode
+				   auto-complete
+				   yasnippet
+				   purty-mode
+				   sbt-mode
+				   ensime
+				   jabber
+				   emacs-eclim
+				   atom-dark-theme
+				   editorconfig
+				   rcirc
+				   diminish
+				   paredit-menu
+				   clojure-snippets))
 
 (ensure-packages-install-missing)
 
@@ -41,10 +40,10 @@
 (global-whitespace-mode 1)
 
 (if (eq system-type 'darwin)
-		(require 'slipset-osx))
+    (require 'slipset-osx))
 
 (if (eq system-type 'windows-nt)
-		(require 'slipset-windows-nt))
+    (require 'slipset-windows-nt))
 
 (require 'paredit-menu)
 (require 'flymake-cursor)
@@ -61,7 +60,7 @@
 (require 'slipset-yasnippet)
 
 (tool-bar-mode -1)
-(menu-bar-mode -1)
+(menu-bar-mode 1)
 (scroll-bar-mode -1)
 (line-number-mode t)
 (display-time-mode t)
@@ -81,7 +80,6 @@
 (setq ac-ignore-case nil)
 (define-key global-map (kbd "RET") 'newline-and-indent)
 
-(setq tab-width 4)
 
 (require 'projectile)
 (projectile-global-mode)
@@ -94,22 +92,8 @@
  ;; If you edit it by hand, you could mess it up, so be careful.
  ;; Your init file should contain only one such instance.
  ;; If there is more than one, they won't work right.
- '(custom-safe-themes
-	 (quote
-		("90d329edc17c6f4e43dbc67709067ccd6c0a3caa355f305de2041755986548f2" "ed5af4af1d148dc4e0e79e4215c85e7ed21488d63303ddde27880ea91112b07e" "33cffbc75316519ccb6da6353e4a39d6c800f66af6003c92876ef37a1af07995" default)))
- '(eclim-eclipse-dirs (quote ("/Applications/eclipse")))
- '(eclim-executable "/Applications/eclipse/eclim")
- '(edconf-exec-path "C:\\Program Files (x86)\\editorconfig\\bin\\editorconfig")
  '(httpd-port 8848)
- '(safe-local-variable-values (quote ((whitespace-cleanup-mode . t))))
- '(tab-width 2))
-
-(custom-set-faces
- ;; custom-set-faces was added by Custom.
- ;; If you edit it by hand, you could mess it up, so be careful.
- ;; Your init file should contain only one such instance.
- ;; If there is more than one, they won't work right.
- )
+ '(safe-local-variable-values (quote ((whitespace-cleanup-mode . t)))))
 
 (global-auto-revert-mode 1)
 
@@ -120,5 +104,6 @@
 
 (require 'jabber)
 
+(setq edconf-exec-path slipset-edconf-exec-path)
 
 (add-hook 'emacs-lisp-mode-hook 'enable-paredit-mode)