From a73af1ec9b611b5f29ed5c20b0dcf48cbeddc7ac Mon Sep 17 00:00:00 2001
From: Luke Hoersten <Luke@Hoersten.org>
Date: Mon, 29 Nov 2010 11:40:31 -0600
Subject: Added align-with-spaces require.

---
 darwin.el                     |  3 ++-
 hoersten-align-with-spaces.el | 16 ++++++++++++++++
 hoersten-c-style.el           |  1 +
 hoersten-pastebin-region.el   |  1 +
 init.el                       | 34 +++++++++++++---------------------
 linux.el                      |  4 ++--
 6 files changed, 35 insertions(+), 24 deletions(-)
 create mode 100644 hoersten-align-with-spaces.el

diff --git a/darwin.el b/darwin.el
index 9c7e812..79071f6 100644
--- a/darwin.el
+++ b/darwin.el
@@ -11,4 +11,5 @@
       (set-default-font "Menlo-12")
       ))
 
-(provide 'darwin)
\ No newline at end of file
+(message "Loaded Darwin settings")
+(provide 'darwin)
diff --git a/hoersten-align-with-spaces.el b/hoersten-align-with-spaces.el
new file mode 100644
index 0000000..fd4806d
--- /dev/null
+++ b/hoersten-align-with-spaces.el
@@ -0,0 +1,16 @@
+;; ~/.emacs.d/hoersten-align-with-spaces.el
+;; Luke Hoersten <Luke@Hoersten.org>
+
+(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 "Loaded Hoersten align-with-spaces function")
+(provide 'hoersten-align-with-spaces)
diff --git a/hoersten-c-style.el b/hoersten-c-style.el
index 783f45f..a3122fb 100644
--- a/hoersten-c-style.el
+++ b/hoersten-c-style.el
@@ -73,4 +73,5 @@
 (add-to-list 'auto-mode-alist '("\\.ipp$" . c++-mode))
 (add-to-list 'auto-mode-alist '("\\.inl$" . c++-mode))
 
+(message "Loaded Hoersten C style")
 (provide 'hoersten-c-style)
\ No newline at end of file
diff --git a/hoersten-pastebin-region.el b/hoersten-pastebin-region.el
index ccaa0ef..70ca651 100644
--- a/hoersten-pastebin-region.el
+++ b/hoersten-pastebin-region.el
@@ -39,4 +39,5 @@
              (insert redirected)
              (clipboard-kill-ring-save (point-min) (point-max))))))))))
 
+(message "Loaded Hoersten pastebin")
 (provide 'hoersten-pastebin-region)
diff --git a/init.el b/init.el
index 8a8c5d0..a93585f 100644
--- a/init.el
+++ b/init.el
@@ -2,7 +2,7 @@
 ;; Luke Hoersten <Luke@Hoersten.org>
 
 ;; general
-(add-to-list 'load-path "~/.emacs.d/")                  ; set default emacs load path
+(add-to-list 'load-path "~/.emacs.d")                  ; set default emacs load path
 
 (setq-default
  ediff-split-window-function 'split-window-horizontally ; diff horizontally
@@ -56,18 +56,6 @@
    haskell-mode-hook
    emacs-lisp-mode-hook))
 
-;; use only spaces for alignment
-(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)))
-
 ;; X stuff
 (if window-system
     (progn
@@ -94,12 +82,13 @@
 ;;;;;;;;;;;;; includes & requires ;;;;;;;;;;;;;
 
 ;; includes
-(require 'hoersten-pastebin-region) ; send selected text to pastebin
-(require 'hoersten-c-style)         ; load c specific lisp
-(require 'vala-mode)                ; vala programming language
+(require 'hoersten-align-with-spaces) ; use only spaces for alignment
+(require 'hoersten-pastebin-region)   ; send selected text to pastebin
+(require 'hoersten-c-style)           ; load c specific lisp
+(require 'vala-mode)                  ; vala programming language
 
 ;; nav mode
-(add-to-list 'load-path "~/.emacs.d/nav/")
+(add-to-list 'load-path "~/.emacs.d/nav")
 (require 'nav)
 
 ;; unicode
@@ -107,10 +96,11 @@
 (global-pretty-mode t)
 
 ;; snippets
-(add-to-list 'load-path "~/.emacs.d/yasnippet/")
+(add-to-list 'load-path "~/.emacs.d/yasnippet")
 (require 'yasnippet)
 (yas/initialize)
-(yas/load-directory "~/.emacs.d/yasnippet/snippets/")
+(yas/load-directory "~/.emacs.d/yasnippet/snippets")
+(setq-default yas/prompt-functions '(yas/ido-prompt yas/dropdown-prompt)) ; use ido for multiple snippets
 
 ;; python mode
 (add-hook
@@ -129,10 +119,12 @@
    (haskell-indent-mode t)
    (capitalized-words-mode t)
    (haskell-doc-mode t)
-   ;; (imenu-add-menubar-index t)
+   (imenu-add-menubar-index t)
    (setq
     haskell-font-lock-symbols 'unicode
-    haskell-indent-offset 3)))
+    haskell-indent-offset 3))
+ t ;; append instead of prepend else haskell-mode overwrites these settings
+ )
 
 ;; zencoding html
 (require 'zencoding-mode)
diff --git a/linux.el b/linux.el
index c337c28..a96274a 100644
--- a/linux.el
+++ b/linux.el
@@ -5,5 +5,5 @@
     (progn
       (set-default-font "Monospace-10")
       ))
-
-(provide 'linux)
\ No newline at end of file
+(message "Loaded Linux settings")
+(provide 'linux)
-- 
cgit v1.2.3