diff options
| author | Michael Olson <mwolson@gnu.org> | 2008-06-19 04:59:11 +0000 |
|---|---|---|
| committer | Michael Olson <mwolson@gnu.org> | 2008-06-19 04:59:11 +0000 |
| commit | 40ef82425268e306133904b13cc360b8e86f37b3 (patch) | |
| tree | 834f4688e7a21f0de786346c4d2831ec13a7bd3c /lisp/erc/erc-services.el | |
| parent | dced1efdffdc7896403d88bd818a324c6a864a98 (diff) | |
| download | emacs-40ef82425268e306133904b13cc360b8e86f37b3.tar.gz | |
ERC: Upstream updates.
- New response handler for '328'.
- Update nickserv regexps for freenode.
- Back out changes to erc-put-text-properties in favor of upstream
changes to that same effect.
- Fix arguments to erc-put-text-properties in erc-display-line-1.
Diffstat (limited to 'lisp/erc/erc-services.el')
| -rw-r--r-- | lisp/erc/erc-services.el | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/erc/erc-services.el b/lisp/erc/erc-services.el index 50628167252..a4886624893 100644 --- a/lisp/erc/erc-services.el +++ b/lisp/erc/erc-services.el @@ -232,10 +232,11 @@ Example of use: "NickServ!NickServ@services." ;; freenode also accepts a password at login, see the `erc' ;; :password argument. - "/msg\\s-NickServ\\s-IDENTIFY\\s-<password>" + "This\\s-nickname\\s-is\\s-registered.\\s-Please\\s-choose" "NickServ" "IDENTIFY" nil nil - "Password\\s-accepted\\s--\\s-you\\s-are\\s-now\\s-recognized") + ;; See also the 901 response code message. + "You\\s-are\\s-now\\s-identified\\s-for\\s-") (GalaxyNet "NS!nickserv@galaxynet.org" "Please\\s-change\\s-nicks\\s-or\\s-authenticate." |