Merge branch 'master' of github.com:vu3rdd/.emacs.d

diff --combined init.el
index 57278ecc654f442de94cf53cfd2410ce01b343cf,38baf78e60775a7b35e70f0733238565dd138c1c..330c5bc042bed5415805ddc6ae7a7055bd3dbaac
--- 1/init.el
--- 2/init.el
+++ b/init.el
@@@ -1,4 -1,4 +1,4 @@@
- ;; Prevent the cursor from blinking
+ ; Prevent the cursor from blinking
  (blink-cursor-mode 0)
  (show-paren-mode 1)
  ;; y-or-n instead of yes-or-no
@@@ -8,11 -8,15 +8,15 @@@
  (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)
  
  ;; This is bound to f11 in Emacs 24.4
- ;; (toggle-frame-fullscreen) 
+ ;; (toggle-frame-fullscreen)
  (custom-set-variables
   '(initial-frame-alist (quote ((fullscreen . maximized)))))
  ;; Who use the bar to scroll?
@@@ -31,12 -35,12 +35,12 @@@
               '("marmalade" . "http://marmalade-repo.org/packages/") t)
  (package-initialize)
  
- ; fetch the list of packages available 
+ ; fetch the list of packages available
  (unless package-archive-contents
    (package-refresh-contents))
  
  ;; make sure my list of packages are installed
 -(setq package-list '(rust-mode haskell-mode monokai-theme ghc))
 +(setq package-list '(rust-mode haskell-mode go-mode monokai-theme ghc))
  
  ; install the missing packages
  (dolist (package package-list)
@@@ -48,10 -52,12 +52,12 @@@
  
  ;; erc
  (require 'erc)
+ (require 'tls)
+ ;; (setq tls-program '("openssl s_client -connect %h:%p -no_ssl2 -ign_eof"))
  
  (erc-autojoin-mode t)
  (setq erc-autojoin-channels-alist
-   '((".*\\.freenode.net" "#tahoe-lafs")
+   '((".*\\.freenode.net" "#tahoe-lafs" "#haskell-beginners")
      (".*\\.oftc.net" "#LeastAuthority")))
  
  ;; check channels
@@@ -66,8 -72,8 +72,8 @@@
    "Connect to IRC."
    (interactive)
    (when (y-or-n-p "Do you want to start IRC? ")
-     (erc :server "irc.freenode.net" :port 6667 :nick "rkrishnan" :full-name "Ramakrishnan Muthukrishnan")
-     (erc :server "irc.oftc.net" :port 6667 :nick "rkrishnan" :full-name "Ramakrishnan Muthukrishnan")))
+     (erc-tls :server "irc.freenode.net" :port 6697 :nick "rkrishnan" :full-name "Ramakrishnan Muthukrishnan")
+     (erc-tls :server "irc.oftc.net" :port 6697 :nick "rkrishnan" :full-name "Ramakrishnan Muthukrishnan")))
  
  ;; switch to ERC with Ctrl+c e
  (global-set-key (kbd "C-c e") 'start-erc) ;; ERC
@@@ -75,31 -81,35 +81,35 @@@
  ;; haskell mode
  (setenv "PATH" (concat "~/.cabal/bin:" (getenv "PATH")))
  (add-to-list 'exec-path "~/.cabal/bin")
+ (add-hook 'haskell-mode-hook 'turn-on-haskell-doc-mode)
+ ;; (add-hook 'haskell-mode-hook 'haskell-indent-mode)
+ ;; (add-hook 'haskell-mode-hook 'interactive-haskell-mode)
+ ;(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)
- (setq auto-mode-alist
-       (append '(("\\.ml[ily]?$" . tuareg-mode)
-                 ("\\.topml$" . tuareg-mode))
-               auto-mode-alist))
- (autoload 'utop-setup-ocaml-buffer "utop" "Toplevel for OCaml" t)
- (add-hook 'tuareg-mode-hook 'utop-setup-ocaml-buffer)
- (add-hook 'tuareg-mode-hook 'merlin-mode)
- ;; Start merlin on ocaml files
- (add-hook 'caml-mode-hook 'merlin-mode t)
- ;; Enable auto-complete
- (setq merlin-use-auto-complete-mode 'easy)
- ;; Use opam switch to lookup ocamlmerlin binary
- (setq merlin-command 'opam)
- (setq merlin-error-after-save nil)
- 
- ;; ocp-indent
- ;; (add-to-list 'load-path "/Users/ramakrishnanm/.opam/4.02.1/share/emacs/site-lisp")
- ;; (require 'ocp-indent)
- 
  ;; ghc-mod
  (autoload 'ghc-init "ghc" nil t)
  (autoload 'ghc-debug "ghc" nil t)
  (add-hook 'haskell-mode-hook (lambda () (ghc-init)))
  
+ ;; ido
+ (setq ido-enable-flex-matching t)
+ (setq ido-everywhere t)
+ (ido-mode 1)
+ 
+ ;; disable tabs for indentation
+ (setq-default indent-tabs-mode nil)
+ 
+ ;; (require 'whitespace)
+ ;; (setq whitespace-style '(face lines-tail))
+ ;; (setq whitespace-line-column 80)
+ ;; (global-whitespace-mode t)
+ 
+ ;; ;; show trailing whitespaces
+ ;; (setq-default show-trailing-whitespace t)
+ ;; (setq-default indicate-empty-lines t)
+ 
+ ;; C style
+ (setq c-default-style "k&r"
+       c-basic-offset 4)
+