whitespace mode

diff --git a/init.el b/init.el
index f7b0148bdb627d035b8c0ece45f9d46a40c7b07b..2e72e52448694e03fb0426c6d8a88cb8fde896c3 100644 (file)
--- a/init.el
+++ b/init.el
@@ -57,7 +57,7 @@
 
 (erc-autojoin-mode t)
 (setq erc-autojoin-channels-alist
-  '((".*\\.freenode.net" "#haskell-beginners")
+  '((".*\\.freenode.net" "#tahoe-lafs" "#haskell-beginners")
     (".*\\.oftc.net" "#LeastAuthority")))
 
 ;; check channels
@@ -99,14 +99,14 @@
 ;; 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)
+;; (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)
+;; ;; show trailing whitespaces
+;; (setq-default show-trailing-whitespace t)
+;; (setq-default indicate-empty-lines t)
 
 ;; C style
 (setq c-default-style "k&r"