summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/init-editing.el4
-rw-r--r--lisp/init-general.el10
-rw-r--r--lisp/init-projectile.el5
-rw-r--r--lisp/init-yas.el3
4 files changed, 12 insertions, 10 deletions
diff --git a/lisp/init-editing.el b/lisp/init-editing.el
index 69ae087..e6595e6 100644
--- a/lisp/init-editing.el
+++ b/lisp/init-editing.el
@@ -12,8 +12,6 @@
try-complete-lisp-symbol-partially
try-complete-lisp-symbol))
-(electric-indent-mode -1)
-
;; http://www.emacswiki.org/emacs/UnfillParagraph
(defun km/unfill-paragraph ()
"Convert a multi-line paragraph to a single line of text."
@@ -167,6 +165,8 @@ and '<<<' mark the bounds of the narrowed region.
(define-key km/editing-map "f" 'km/fill-surrounding-indented)
(define-key km/editing-map "i" 'indent-relative)
+(electric-indent-mode -1)
+
;;; Buffer cleanup
diff --git a/lisp/init-general.el b/lisp/init-general.el
index f6606a6..44c4673 100644
--- a/lisp/init-general.el
+++ b/lisp/init-general.el
@@ -23,11 +23,6 @@
(add-hook 'after-save-hook
'executable-make-buffer-file-executable-if-script-p)
-(show-paren-mode)
-(global-auto-revert-mode)
-(transient-mark-mode -1)
-(key-chord-mode 1)
-
(defun km/imenu (rescan)
"Call `imenu', rescanning if RESCAN is non-nil."
(interactive "P")
@@ -67,4 +62,9 @@
(define-key occur-mode-map "n" 'next-line)
(define-key occur-mode-map "p" 'previous-line)
+(show-paren-mode)
+(global-auto-revert-mode)
+(transient-mark-mode -1)
+(key-chord-mode 1)
+
(provide 'init-general)
diff --git a/lisp/init-projectile.el b/lisp/init-projectile.el
index b518e4a..1c15ecd 100644
--- a/lisp/init-projectile.el
+++ b/lisp/init-projectile.el
@@ -1,10 +1,9 @@
+(require 'projectile)
(setq projectile-switch-project-action 'projectile-commander
projectile-find-dir-includes-top-level t
projectile-use-git-grep t)
-(projectile-global-mode)
-
(defun km/projectile-switch-project-to-file ()
"Provide access to the of default `projectile-find-file'.
@@ -136,4 +135,6 @@ Interactive arguments are processed according to
"View project file in other window."
(km/projectile-view-file-other-window))
+(projectile-global-mode)
+
(provide 'init-projectile)
diff --git a/lisp/init-yas.el b/lisp/init-yas.el
index a2e0db9..1b367e4 100644
--- a/lisp/init-yas.el
+++ b/lisp/init-yas.el
@@ -1,11 +1,12 @@
(require 'yasnippet)
-(yas-global-mode)
(key-chord-define-global ";e" 'yas-expand)
(define-key yas-minor-mode-map (kbd "<tab>") nil)
(define-key yas-minor-mode-map (kbd "TAB") nil)
+(yas-global-mode)
+
(provide 'init-yas)