Merge branch 'master' of git.distorted.org.uk:~mdw/public-git/profile

* 'master' of git.distorted.org.uk:~mdw/public-git/profile:
  dot/screenrc: Turn off XON/XOFF flow control.
  dot/ercrc.el: New IRC server at Good HSTG.
  dot/ercrc.el: Rearrange bot greeting.
  el/dot-emacs.el: Nicer colours for Emacs w3m mode.

diff --git a/dot/ercrc.el b/dot/ercrc.el
index 55f67fbab75955a9832fb8ea15ef5833baa778fd..525368da74e4c3d032c04b017b54636f8402c6d9 100644 (file)
--- 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")
 
@@ -35,23 +34,19 @@ (setq erc-autojoin t
        ("cam.irc.devel.ncipher.com"
         "#devel" "#jukebox" "#nextgen" "#sec-team")
        ("chiark.greenend.org.uk" "#chiark")
-       ("irc.distorted.org.uk" "#distorted" "#jukebox")))
+       ("irc.distorted.org.uk" "#distorted" "#jukebox")
+       ("irc.hstg.corp.good.com" "#hstg")))
 
-(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))
-    ("irc.distorted.org.uk" "blight"
-     ,(format "identpass mdw %s" mdw-distorted-password)))
+(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)

diff --git a/dot/screenrc b/dot/screenrc
index e1dac2a8504ada78bfc030736f884e9bd7494a1d..d3af7d2e028d7c9681fa7f6252f628559276fe5b 100644 (file)
--- a/dot/screenrc
+++ b/dot/screenrc
@@ -15,6 +15,10 @@ defscrollback 1000
 ## host's alternate-screen switching unless nobbled.)
 altscreen on
 
+## Don't try to do flow control using XON/XOFF characters.  It messes stuff
+## up and is generally annoying.
+defflow off
+
 ## Force UTF-8 now.  Screen can cope with sorting out the mess.
 defencoding utf8
 setenv LC_CTYPE en_GB.utf8

diff --git a/el/dot-emacs.el b/el/dot-emacs.el
index ed1103ae2335730be47addd252e2dd31e17c98d4..20978ded96ecf15b75f4a69cd08db82dbf110bd9 100644 (file)
--- a/el/dot-emacs.el
+++ b/el/dot-emacs.el
@@ -1023,6 +1023,11 @@ (mdw-define-face p4-diff-head-face
 (mdw-define-face p4-diff-ins-face
   (t :foreground "green"))
 
+(mdw-define-face w3m-anchor-face
+  (t :foreground "SkyBlue1" :underline t))
+(mdw-define-face w3m-arrived-anchor-face
+  (t :foreground "SkyBlue1" :underline t))
+
 (mdw-define-face whizzy-slice-face
   (t :background "grey10"))
 (mdw-define-face whizzy-error-face