# HG changeset patch
# User Luke Hoersten <Luke@Hoersten.org>
# Date 1321812312 21600
# Node ID 12715da9a3000993881c47771791d525e1395321
# Parent  6e66ab8d9185771d13a2df5189cbf33f7b400413
Changes to reflect Ubuntu 11.10 upgrade.

diff -r 6e66ab8d9185 -r 12715da9a300 haskell-init.el
--- a/haskell-init.el	Mon Oct 03 09:55:09 2011 -0500
+++ b/haskell-init.el	Sun Nov 20 12:05:12 2011 -0600
@@ -20,9 +20,10 @@
    (haskell-indentation-mode nil)
    (haskell-indent-mode t)
    (capitalized-words-mode t)
+   (imenu-add-menubar-index)
    (haskell-doc-mode t)
    (setq
-    haskell-program-name "/opt/ghc7/bin/ghci"
+    haskell-program-name "ghci"
     haskell-indent-offset 4
     whitespace-line-column 78))
  t) ; append instead of prepend else haskell-mode overwrites these settings
diff -r 6e66ab8d9185 -r 12715da9a300 init.el
--- a/init.el	Mon Oct 03 09:55:09 2011 -0500
+++ b/init.el	Sun Nov 20 12:05:12 2011 -0600
@@ -27,16 +27,14 @@
 (global-hl-line-mode t)                   ; highlight current line
 
 
-;;; coding
+;;; Coding
 (which-func-mode t)                       ; show current function
 (show-paren-mode t)                       ; show matching paren
 (transient-mark-mode t)                   ; show highlighting
 (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 C-c")
- 'comment-or-uncomment-region)            ; toggle region comment
+
 
 ;;; Darwin
 (if (string-match "darwin" (emacs-version))
@@ -50,9 +48,10 @@
         "Get appropriate font based on system and hostname."
         (cond
          ((string-match "darwin" (emacs-version)) "Menlo-12")
-         ((string-match "HoldenCaulfield" (system-name)) "Ubuntu Mono-6.5")
-         ((string-match "lhoersten-66113" (system-name)) "Ubuntu Mono-8.5")
-         ("Ubuntu Mono-10")))
+         ((string-match "RichardParker"   (system-name)) "Ubuntu Mono-8.5")
+         ((string-match "HoldenCaulfield" (system-name)) "Ubuntu Mono-10.5")
+         ((string-match "lhoersten-66113" (system-name)) "Ubuntu Mono-10.5")
+         ("Ubuntu Mono-10.5")))
 
       (tool-bar-mode -1)      ; remove tool bar
       (scroll-bar-mode -1)    ; remove scroll bar
@@ -127,7 +126,7 @@
 ;;; language init
 (require 'c-init)             ; c specific elisp
 (require 'haskell-init)       ; haskell specific elisp
-(require 'color-theme-init)   ; haskell specific elisp
+(require 'color-theme-init)   ; color theme specific elisp
 (require 'vala-mode)          ; vala programming language
 (require 'rainbow-delimiters) ; multi-colored parens