Permalink
Browse files

More sane indenting

  • Loading branch information...
1 parent 79ca759 commit 17d9135c40411a0fa1b4ad37f3d41c33feed97eb @bartvandendriessche committed Feb 19, 2014
Showing with 29 additions and 23 deletions.
  1. +3 −2 settings/settings-defaults.el
  2. +3 −3 settings/settings-lisp.el
  3. +10 −8 settings/settings-programming.el
  4. +13 −10 settings/settings-python.el
@@ -36,8 +36,9 @@
(setq reb-re-syntax 'string) ;; escape backslash hell in re-builder
(setq el-get-sources '((:name color-theme-solarized :after (load-theme 'solarized-dark t))
- (:name magit :type :elpa :after (progn
- (global-set-key (kbd "C-c g") 'magit-status)))
+ (:name magit :type :elpa
+ :after (progn
+ (global-set-key (kbd "C-c g") 'magit-status)))
(:name markdown-mode))))
(provide 'settings-defaults)
@@ -1,9 +1,9 @@
(progn
(setq el-get-sources (append el-get-sources
'((:name auto-complete-emacs-lisp)
- (:name elisp-slime-nav :after (progn
- (add-hook 'emacs-lisp-mode-hook 'elisp-slime-nav-mode)
- )))))
+ (:name elisp-slime-nav
+ :after (progn
+ (add-hook 'emacs-lisp-mode-hook 'elisp-slime-nav-mode))))))
(when (require 'projectile nil 'noerror)
(add-hook 'lisp-mode-hook 'projectile-mode)
(add-hook 'emacs-lisp-mode-hook 'projectile-mode)))
@@ -4,14 +4,16 @@
(:name flycheck :type :elpa)
(:name markdown-mode)
(:name projectile)
- (:name git-gutter :after (progn
- (global-git-gutter-mode +1)
- (set-face-foreground 'git-gutter:modified "purple")
- (set-face-foreground 'git-gutter:added "green")
- (set-face-foreground 'git-gutter:deleted "red")))
- (:name web-mode :type :elpa :after (progn
- (setq web-mode-markup-indent-offset 4)
- (add-to-list 'auto-mode-alist '("\\.html?\\'" . web-mode)))))))
+ (:name git-gutter
+ :after (progn
+ (global-git-gutter-mode +1)
+ (set-face-foreground 'git-gutter:modified "purple")
+ (set-face-foreground 'git-gutter:added "green")
+ (set-face-foreground 'git-gutter:deleted "red")))
+ (:name web-mode :type :elpa
+ :after (progn
+ (setq web-mode-markup-indent-offset 4)
+ (add-to-list 'auto-mode-alist '("\\.html?\\'" . web-mode)))))))
;; ugh, screw yasnippet on windows
(if (not (eq system-type 'windows-nt))
(setq el-get-sources (append el-get-sources
@@ -1,18 +1,21 @@
(progn
(setq el-get-sources (append el-get-sources
- '((:name virtualenv :after (progn
- (put 'virtualenv-workon 'safe-local-variable 'stringp)
- (put 'virtualenv-default-directory 'safe-local-variable 'stringp)))
- (:name virtualenvwrapper :type :elpa :after (progn
- (put 'project-venv-name 'safe-local-variable 'stringp))))))
+ '((:name virtualenv
+ :after (progn
+ (put 'virtualenv-workon 'safe-local-variable 'stringp)
+ (put 'virtualenv-default-directory 'safe-local-variable 'stringp)))
+ (:name virtualenvwrapper :type :elpa
+ :after (progn
+ (put 'project-venv-name 'safe-local-variable 'stringp))))))
(if (not (eq system-type 'windows-nt))
(setq el-get-sources (append el-get-sources
- '((:name jedi :after (progn
- (add-hook 'python-mode-hook 'jedi:setup)
- (setq jedi:install-imenu)
- (setq jedi:use-shortcuts t)
- (setq jedi:complete-on-dot t)))))))
+ '((:name jedi
+ :after (progn
+ (add-hook 'python-mode-hook 'jedi:setup)
+ (setq jedi:install-imenu)
+ (setq jedi:use-shortcuts t)
+ (setq jedi:complete-on-dot t)))))))
(add-hook 'python-mode-hook (lambda ()
(if project-venv-name

0 comments on commit 17d9135

Please sign in to comment.