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

diff --git a/init.el b/init.el
index 72c06b54184d567f4d3379a71b92f60efa5d6036..1a7ba84a923528be168272fe1c1edcb16fcd8ec8 100644 (file)
--- a/init.el
+++ b/init.el
@@ -86,7 +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 +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")))