ERC: OFTC autojoin no longer works with latest in emacs.bzr

ERC: OFTC autojoin no longer works with latest in emacs.bzr

[Jim Meyering]

[I first posted to erc-discuss, then noticed that the list is not very active]

Hello,

First, thanks for ERC!
If this should be directed instead to the emacs-devel list,
let me know and I'll resend.

I noticed recently that I had not been autojoined
to OFTC-hosted channels like I used to be.
autojoining works fine with the two other servers I use.

The problem is that I'm using emacs as built from upstream in bzr/git.
When I switch back to using what's in Fedora 14 (emacs-23.2-7.fc14.x86_64),
it works fine.

Here are parts of my startup file:

(custom-set-variables
 '(erc-autojoin-timing 'ident)
 '(erc-autojoin-delay 10)
 )

(setq erc-autojoin-channels-alist
          '(
            ((...))
            ("oftc.net" . ("#virt" "#storage"))
            ((...))
            ))

----------------------------------
In case it helps, here's the tail of my oftc connection buffer:


-NickServ- This nickname is registered and protected.  If it is your nickname,
	   you may
-NickServ- authenticate yourself to services with the IDENTIFY command.
	   You are
-NickServ- getting this message because you are not on the access list for the
-NickServ- meyering nickname.
*** meyering has changed mode for meyering to +R
-NickServ- You are successfully identified as meyering.


----------------------------------
I did try this off-the-cuff patch, but it didn't help:

diff --git a/lisp/erc/erc-services.el b/lisp/erc/erc-services.el
index 3acc600..1911faa 100644
--- a/lisp/erc/erc-services.el
+++ b/lisp/erc/erc-services.el
@@ -255,8 +255,7 @@ Example of use:
      "IDENTIFY" nil "SQUERY" nil)
     (OFTC
      "NickServ!services@services.oftc.net"
-     ;; OFTC's NickServ doesn't ask you to identify anymore.
-     nil
+     "This\\s-nickname\\s-is\\s-registered\\s-and\\s-protected."
      "NickServ"
      "IDENTIFY" nil nil
      "You\\s-are\\s-successfully\\s-identified\\s-as\\s-")