Fixed a bug with the haskell-mode-hook

2 files changed, 9 insertions, 26 deletions

diff --git a/align-with-spaces.el b/align-with-spaces.el
deleted file mode 100644
index cf0ad39..0000000
--- a/align-with-spaces.el
+++ /dev/null
@@ -1,16 +0,0 @@
-;; ~/.emacs.d/hoersten-align-with-spaces.el
-;; Luke Hoersten <[email protected]>
-
-(global-set-key (kbd "C-c a") 'align-with-spaces)
-(defun align-with-spaces (beg end pattern)
-  "Align selected using only spaces for whitespace."
-  (interactive "r\nsAlign by: ")
-  (let ((indent-tabs-mode nil))
-    (align-string beg end pattern 1)
-    (align-entire beg end)
-    (untabify beg end)
-    (indent-region beg end)
-    (whitespace-cleanup-region beg end)))
-
-(message "Loading align-with-spaces...done")
-(provide 'align-with-spaces)
diff --git a/init.el b/init.el
index 7294d7a..f2340df 100644
--- a/init.el
+++ b/init.el
@@ -33,6 +33,7 @@
 (global-font-lock-mode t)                 ; syntax highlighting
 (global-set-key (kbd "C-c c") 'compile)   ; compile
 (global-set-key (kbd "C-c r") 'recompile) ; recompile
+(global-set-key (kbd "C-c a") 'align-regexp) ; align
 (subword-mode t)                          ; move by camelCase words
 
 
@@ -129,7 +130,6 @@
 
 ;;; requires
 (require 'c-init)             ; c specific elisp
-(require 'align-with-spaces)  ; use only spaces for alignment
 (require 'move-line)          ; move line up or down
 (require 'uniquify)           ; unique buffer names with dirs
 (require 'auto-complete-config)
@@ -180,12 +180,11 @@
 ;;; coding-modes map
 (mapc
  (lambda (x)
-   (add-hook
-    x
-    (lambda ()
-      (linum-mode t)
-      (rainbow-delimiters-mode t)
-      (auto-complete-mode t)) t))
+   (add-hook x
+             (lambda ()
+               (linum-mode t)
+               (rainbow-delimiters-mode t)
+               (auto-complete-mode t))))
  '(text-mode-hook
    c-mode-common-hook
    python-mode-hook
@@ -200,14 +199,14 @@
 (add-hook
  'haskell-mode-hook
  (lambda ()
-   (local-set-key (kbd "C-c i") 'haskell-navigate-imports) ; go to imports. prefix to return
-   (flymake-haskell-multi-load t)
+   (flymake-haskell-multi-load)
    (flymake-mode t)
    (capitalized-words-mode t)
    (turn-on-haskell-indent)
    (turn-on-haskell-doc-mode)
    (turn-on-haskell-decl-scan)
-   (imenu-add-menubar-index t)
+   (imenu-add-menubar-index)
+   (local-set-key (kbd "C-c i") 'haskell-navigate-imports) ; go to imports. prefix to return
    (setq
     haskell-font-lock-haddock t
     haskell-stylish-on-save t