A bunch of minor additions (slime, column-number-mode, #haskell in freenode)

diff --git a/init.el b/init.el
index 0594349e07306086c068d9416f864ea79992a3e2..3c57e338a5b170a7287cda9777b6ead8cb620f53 100644 (file)
--- a/init.el
+++ b/init.el
@@ -8,6 +8,10 @@
 (setq make-backup-files nil)
 (setq initial-scratch-message "")
 (setq inhibit-startup-message t)
+
+;; column number
+(column-number-mode 1)
+
 ;; Don't let Emacs hurt your ears
 (setq visible-bell t)
 
@@ -36,7 +40,7 @@
   (package-refresh-contents))
 
 ;; make sure my list of packages are installed
-(setq package-list '(rust-mode haskell-mode monokai-theme ghc go-mode))
+(setq package-list '(rust-mode haskell-mode monokai-theme ghc slime go-mode))
 
 ; install the missing packages
 (dolist (package package-list)
@@ -51,7 +55,7 @@
 
 (erc-autojoin-mode t)
 (setq erc-autojoin-channels-alist
-  '((".*\\.freenode.net" "#tahoe-lafs")
+  '((".*\\.freenode.net" "#haskell" "#tahoe-lafs")
     (".*\\.oftc.net" "#LeastAuthority")))
 
 ;; check channels
@@ -75,7 +79,8 @@
 ;; haskell mode
 (setenv "PATH" (concat "~/.cabal/bin:" (getenv "PATH")))
 (add-to-list 'exec-path "~/.cabal/bin")
-(add-hook 'haskell-mode-hook 'turn-on-haskell-indentation)
+(add-hook 'haskell-mode-hook 'turn-on-haskell-indent)
+;; (add-hook 'haskell-mode-hook 'turn-on-haskell-indentation)
 
 ;; ocaml
 (add-hook 'tuareg-mode-hook 'tuareg-imenu-set-imenu)
@@ -128,3 +133,10 @@
 
 ;; switch to ERC with Ctrl+c e
 (global-set-key (kbd "C-c e") 'start-erc) ;; ERC
+
+;; sbcl
+(setq inferior-lisp-program "/usr/local/bin/sbcl")
+(require 'slime-autoloads)
+(add-to-list 'slime-contribs '(slime-fancy))
+(eval-after-load 'slime
+  `(define-key slime-prefix-map (kbd "M-h") 'slime-documentation-lookup))