Added doxymacs and provides for requires.

3 files changed, 33 insertions, 20 deletions

diff --git a/emacs.el b/emacs.el
index 7bc1a2e..22af730 100644
--- a/emacs.el
+++ b/emacs.el
@@ -1,7 +1,9 @@
-;; ~/.emacs - Luke Hoersten - v4.0
+;; ~/.emacs
+;; Luke Hoersten <[email protected]>
 
 ;; general
-(setq-default load-path (cons "~/.emacs.d" load-path))                ; set default emacs load path
+(setq-default load-path (cons "~/.emacs.d/" load-path))               ; set default emacs load path
+(setq-default user-mail-address "[email protected]")
 
 (setq-default ediff-split-window-function 'split-window-horizontally) ; diff horizontally
 (setq-default x-select-enable-clipboard t)                            ; paste from X buffer
@@ -21,16 +23,25 @@
 ;; coding
 (which-func-mode t)                                                   ; show current function
 (show-paren-mode t)                                                   ; show matching paren
+(setq-default show-paren-style 'mixed)
 (transient-mark-mode t)                                               ; show highlighting
 (global-font-lock-mode t)                                             ; syntax highlighting
 (global-whitespace-mode t)                                            ; show whitespace
 (setq-default whitespace-style '(tab-mark trailing tabs empty))       ; what whitespace elements to show
 (add-hook 'before-save-hook 'whitespace-cleanup)                      ; cleanup whitespace on exit
-(load "hoersten-pastebin-region")                                     ; send selected text to pastebin
-(load "mercurial")                                                    ; load mercurial mode
-(load "ahg")                                                          ; load suplimental mercurial mode
-(load "hoersten-c-style")                                             ; load c specific lisp
-(global-set-key (kbd "C-c c") 'compile)
+(global-set-key (kbd "C-c c") 'compile)                               ; compile
+
+(require 'hoersten-pastebin-region)                                   ; send selected text to pastebin
+(require 'mercurial)                                                  ; load mercurial mode
+(require 'hoersten-c-style)                                           ; load c specific lisp
+
+(require 'pretty-mode)                                                ; convert characters to unicode
+(global-pretty-mode t)
+(setq haskell-font-lock-symbols 'unicode)
+
+(require 'yasnippet)
+(yas/initialize)
+(yas/load-directory "~/.emacs.d/snippets/")
 
 ;; gdb settings
 (setq-default gdb-many-windows t)                                     ; gdb many windows
@@ -38,9 +49,6 @@
 (setq-default gud-tooltip-mode t)                                     ; mouse hover variables
 (global-set-key (kbd "C-c g") 'gdb)                                   ; gdb
 
-;; haskell
-(setq haskell-font-lock-symbols 'unicode)
-
 ;; use only spaces for alignment
 (global-set-key (kbd "C-c a") 'align-with-spaces) ; align
 (defun align-with-spaces (beg end pattern)
@@ -73,7 +81,7 @@
     (menu-bar-mode nil) ; remove menu bar in no-x mode
   (tool-bar-mode nil)   ; remove tool bar
   (scroll-bar-mode nil) ; remove scroll bar
-  (custom-set-faces '(default ((t (:background "#000000" :foreground "#ffffff" :height 100 :family "DejaVu Sans Mono")))))
+  (custom-set-faces '(default ((t (:background "#000000" :foreground "#ffffff" :height 101 :family "DejaVu Sans Mono")))))
   (setq default-frame-alist '((width . 100) (height . 50) (menu-bar-lines . 1)))
 
   ;; twilight theme
diff --git a/hoersten-c-style.el b/hoersten-c-style.el
index 28405e6..feed4ac 100644
--- a/hoersten-c-style.el
+++ b/hoersten-c-style.el
@@ -1,4 +1,5 @@
-;; ~/.emacs.d/hoersten-c-style.el - Luke Hoersten - v1.0
+;; ~/.emacs.d/hoersten-c-style.el
+;; Luke Hoersten <[email protected]>
 
 ;; hoersten c++-style
 (c-add-style "hoersten"
@@ -26,17 +27,21 @@
                 (cpp-macro         . -))))
 
 ;; c-like language settings (c, c++, java, etc.)
+(require 'doxymacs)
 (setq-default c-hungry-delete-key t)                             ; enable hungry delete
 (setq-default c-default-style "hoersten")                        ; load c-style
 (add-hook 'c-mode-common-hook
-          (lambda()
+          (lambda ()
             ;; indentation
             (setq tab-width 3)
             (setq c-basic-offset 3)
             (setq indent-tabs-mode t)
+            (setq standard-indent 3)
 
             (c-toggle-auto-newline t)                            ; auto newline
-            (auto-fill-mode t)                                   ; word wrap
+            (c-subword-mode t)
+            (doxymacs-mode t)
+            (doxymacs-font-lock)
 
             ;; custom keys
             (local-set-key (kbd "C-c f")   'ff-find-other-file)  ; toggle header/source file
@@ -47,9 +52,6 @@
             (local-set-key (kbd "<f1>")  'hs-hide-all)
             (local-set-key (kbd "<f2>")  'hs-show-all)
             (hs-minor-mode t)                                    ; enable hide-show mode
-            (hs-hide-all)                                        ; hide all blocks by default
+            ))
 
-            ;; highlight todos
-            (font-lock-add-keywords
-             nil
-             '(("\\([@]\\(TODO\\|todo\\|warning\\|note\\)\\)" 1 font-lock-warning-face t)))))
+(provide 'hoersten-c-style)
\ No newline at end of file
diff --git a/hoersten-pastebin-region.el b/hoersten-pastebin-region.el
index 2430329..4ac278f 100644
--- a/hoersten-pastebin-region.el
+++ b/hoersten-pastebin-region.el
@@ -1,4 +1,5 @@
-;; ~/.emacs.d/hoersten-pastebin-region.el - Luke Hoersten - v0.6
+;; ~/.emacs.d/hoersten-pastebin-region.el
+;; Luke Hoersten <[email protected]>
 
 ;; custom keys
 (global-set-key (kbd "C-c w") 'pastebin-region)
@@ -33,3 +34,5 @@
                                      (with-temp-buffer
                                        (insert redirected)
                                        (clipboard-kill-ring-save (point-min) (point-max))))))))))
+
+(provide 'hoersten-pastebin-region)