diff options
| author | Luke Hoersten <[email protected]> | 2011-11-20 12:05:12 -0600 |
|---|---|---|
| committer | Luke Hoersten <[email protected]> | 2011-11-20 12:05:12 -0600 |
| commit | 5de643c447d50eb3a58a80854c29f41cb71c0baf (patch) | |
| tree | 50238e873a1a84b9ef660821f9a1f19b5119d8f9 | |
| parent | 66bfb4e2e2f5a204a9f8e7404fabcb57e366fcd4 (diff) | |
Changes to reflect Ubuntu 11.10 upgrade.
| -rw-r--r-- | haskell-init.el | 3 | ||||
| -rw-r--r-- | init.el | 15 |
2 files changed, 9 insertions, 9 deletions
diff --git a/haskell-init.el b/haskell-init.el index c73cc95..2ea4acd 100644 --- a/haskell-init.el +++ b/haskell-init.el @@ -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 @@ -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 |