X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/370b97b0dd4b59b1967b2f6090053cb586a5eca1..faa3255614fbe4a3e5780cc482640cafba59da43:/dot/ercrc.el

diff --git a/dot/ercrc.el b/dot/ercrc.el
index afb78fc..30da860 100644
--- a/dot/ercrc.el
+++ b/dot/ercrc.el
@@ -2,7 +2,6 @@
 ;;;
 ;;; ERC configuration
 
-(load "~/.erc-auth.el")
 (setq erc-nick "mdw"
       erc-user-full-name "Mark Wooding")
 
@@ -13,6 +12,7 @@
       erc-timestamp-right-column 68
       erc-fill-prefix "   "
       erc-max-buffer-size (* 60 3000))
+(erc-scrolltobottom-enable)
 
 (load "~/.erc-local.el")
 
@@ -34,21 +34,20 @@
       '(("irc.ssdis.loc" "#devel" "#jukebox" "#nextgen")
 	("cam.irc.devel.ncipher.com"
 	 "#devel" "#jukebox" "#nextgen" "#sec-team")
-	("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))
-    ("chiark.greenend.org.uk" "blight"
-     ,(format "identpass mdw %s" mdw-blight-password))
-    ("tunnel.chiark.greenend.org.uk" "blight"
-     ,(format "identpass mdw %s" mdw-blight-password)))
+	("chiark.greenend.org.uk" "#chiark")
+	("irc.distorted.org.uk" "#distorted" "#jukebox")
+	("irc.hstg.corp.good.com" "#hstg")))
+
+(defvar mdw-erc-auto-greet-bots-alist nil
   "*Alist of (SERVER-REGEXP BOT-NICK MESSAGE-FORM).
 Evaluate MESSAGE-FORM and sent to BOT-NICK when connected to a server which
 matches SERVER-REGEXP.")
 
+(defun mdw-define-bot-greeting (server bot greeting)
+  "Define a new bot greeting."
+  (push (list server bot greeting) mdw-erc-auto-greet-bots-alist))
+(load "~/.erc-auth.el")
+
 (defun mdw-erc-auto-greet-bots (server nick)
   "Send greeting message to bots."
   (dolist (l mdw-erc-auto-greet-bots-alist)
@@ -57,3 +56,7 @@ matches SERVER-REGEXP.")
 	    (message (caddr l)))
 	(erc-server-send (concat "PRIVMSG " bot " :" message))))))
 (add-hook 'erc-after-connect 'mdw-erc-auto-greet-bots)
+
+(defun erc-cmd-GREET ()
+  "Send greeting messages, according to `mdw-erc-auto-greet-bots-alist'."
+  (mdw-erc-auto-greet-bots erc-session-server (erc-current-nick)))