dot/gitconfig.in: Stage merge conflicts fixed up by `git-rerere'.

[profile] / dot / ercrc.el

diff --git a/dot/ercrc.el b/dot/ercrc.el
index df45479..8ccbbb8 100644 (file)
--- a/dot/ercrc.el
+++ b/dot/ercrc.el
@@ -6,8 +6,8 @@
 (setq erc-nick "mdw"
       erc-user-full-name "Mark Wooding")
 
-(setq erc-fill-column 77
-      erc-timestamp-right-column 69
+(setq erc-fill-column 76
+      erc-timestamp-right-column 68
       erc-fill-prefix "   ")
 
 (load "~/.erc-local.el")
@@ -16,20 +16,28 @@
 
 (setq erc-auto-query 'buffer)
 
+(defun mdw-erc-turn-off-truncate-lines ()
+  (setq truncate-lines nil
+       truncate-partial-with-windows nil
+       word-wrap t
+       wrap-prefix (concat (propertize "    " 'face 'erc-prompt-face)
+                           " ")))
+(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")
-       ("localhost:16667" "#chiark")))
+       ("chiark.greenend.org.uk" "#chiark")))
 
 (defvar mdw-erc-auto-greet-bots-alist
   `(("irc.ssdis.loc" "fastness"
      ,(format "identpass mwooding %s" mdw-fastness-password))
     ("cam.irc.devel.ncipher.com" "fastness"
      ,(format "identpass mwooding %s" mdw-fastness-password))
-    ("localhost:16667" "blight"
+    ("chiark.greenend.org.uk" "blight"
      ,(format "identpass mdw %s" mdw-blight-password)))
   "*Alist of (SERVER-REGEXP BOT-NICK MESSAGE-FORM).
 Evaluate MESSAGE-FORM and sent to BOT-NICK when connected to a server which