dot/shell-rc: Run `make' nicely by default.

[profile] / dot / ercrc.el

diff --git a/dot/ercrc.el b/dot/ercrc.el
index d035c64d4ec37ad5fc1ff2592d6d642edf19f591..3881cc12c46eac9abda3720758ada109d61ae149 100644 (file)
--- a/dot/ercrc.el
+++ b/dot/ercrc.el
@@ -13,8 +13,6 @@ (setq erc-fill-column 76
       erc-fill-prefix "   "
       erc-max-buffer-size (* 60 3000))
 
-(load "~/.erc-local.el")
-
 (setq erc-track-exclude-types '("NICK" "JOIN" "PART"))
 
 (setq erc-auto-query 'buffer)
@@ -30,12 +28,10 @@ (add-hook 'erc-mode-hook 'mdw-erc-turn-off-truncate-lines)
 (setq erc-autojoin t
       erc-autojoin-domain-only nil
       erc-autojoin-channels-alist
-      '(("irc.ssdis.loc" "#devel" "#jukebox" "#nextgen")
-       ("cam.irc.devel.ncipher.com"
-        "#devel" "#jukebox" "#nextgen" "#sec-team")
-       ("chiark.greenend.org.uk" "#chiark")
+      '(("chiark.greenend.org.uk" "#chiark")
        ("irc.distorted.org.uk" "#distorted" "#jukebox")
        ("irc.hstg.corp.good.com" "#hstg")))
+(erc-autojoin-mode 1)
 
 (defvar mdw-erc-auto-greet-bots-alist nil
   "*Alist of (SERVER-REGEXP BOT-NICK MESSAGE-FORM).
@@ -96,7 +92,6 @@ (defun mdw-add-ircop-credentials (server acct passwd)
   (mdw-pushnew-replace (list server acct passwd)
                       mdw-erc-ircop-alist
                       :test #'string= :key #'car))
-(load "~/.erc-auth.el")
 
 (defun mdw-assoc-regexp (regexp alist)
   "Return the association in ALIST whose car matches REGEXP."
@@ -126,3 +121,6 @@ (defun erc-cmd-IRCOP ()
       (let ((acct (cadr a))
            (passwd (caddr a)))
        (erc-server-send (concat "OPER " acct " " passwd))))))
+
+(load "~/.erc-auth.el")
+(load "~/.erc-local.el")