From: Ramakrishnan Muthukrishnan <ram@rkrishnan.org>
Date: Sun, 6 Dec 2015 10:57:16 +0000 (+0530)
Subject: Merge branch 'master' of github.com:vu3rdd/.emacs.d
X-Git-Url: https://git.rkrishnan.org/?a=commitdiff_plain;h=ed096cdfb756163e88c37fb29d67f27705930519;hp=-c;p=.emacs.d.git

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

ed096cdfb756163e88c37fb29d67f27705930519
diff --combined init.el
index 72c06b5,0e9c17f..1a7ba84
--- a/init.el
+++ b/init.el
@@@ -40,8 -40,8 +40,8 @@@
  (require 'package)
  (add-to-list 'package-archives
               '("melpa" . "http://melpa.milkbox.net/packages/") t)
 -(add-to-list 'package-archives
 -             '("marmalade" . "http://marmalade-repo.org/packages/") t)
 +;; (add-to-list 'package-archives
 +;;              '("marmalade" . "http://marmalade-repo.org/packages/") t)
  (package-initialize)
  
  ; fetch the list of packages available
@@@ -61,9 -61,7 +61,9 @@@
                       notmuch
                       railscasts-theme
                       racket-mode
 -                     auto-complete
 +                     company-mode
 +                     flycheck
 +                     flycheck-haskell
                       magit
                       ledger-mode))
  
@@@ -86,7 -84,8 +86,8 @@@
  (setq erc-autojoin-channels-alist
    '((".*\\.freenode.net" "#tahoe-lafs")
      (".*\\.oftc.net" "#LeastAuthority")
-     (".*\\.mozilla.org" "#rust-beginners")))
+     ;;(".*\\.mozilla.org" "#rust-beginners")
+     ))
  
  ;; check channels
  (erc-track-mode t)
@@@ -99,7 -98,7 +100,7 @@@
    "Connect to IRC."
    (interactive)
    (when (y-or-n-p "Do you want to start IRC? ")
-     (erc-tls :server "irc.mozilla.org" :port 6697 :nick "rkrishnan" :full-name "Ramakrishnan Muthukrishnan")
+     ;;(erc-tls :server "irc.mozilla.org" :port 6697 :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")))
  
@@@ -221,8 -220,9 +222,8 @@@
   ;; If there is more than one, they won't work right.
   )
  
 -;; auto complete
 -(ac-config-default)
 -(ac-linum-workaround)
 +;; company mode for auto completion
 +(add-hook 'after-init-hook 'global-company-mode)
  
  ;; highlight todo
  ;; (add-hook 'prog-mode-hook 'highlight-todos)