diff options
| author | Michael Olson <mwolson@gnu.org> | 2008-01-10 03:51:14 +0000 |
|---|---|---|
| committer | Michael Olson <mwolson@gnu.org> | 2008-01-10 03:51:14 +0000 |
| commit | 712e2b05e11b9f48e02f16890f916aa76a66ba50 (patch) | |
| tree | 58121bb35afd2d5b367147d7166bc02b974f60f1 /lisp/erc/erc-services.el | |
| parent | f9adf05bac8484b01da84f18e6053a074509384b (diff) | |
| download | emacs-712e2b05e11b9f48e02f16890f916aa76a66ba50.tar.gz | |
ERC: Sync changes from upstream.
Diffstat (limited to 'lisp/erc/erc-services.el')
| -rw-r--r-- | lisp/erc/erc-services.el | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/lisp/erc/erc-services.el b/lisp/erc/erc-services.el index ac57de9cd15..028d358ad39 100644 --- a/lisp/erc/erc-services.el +++ b/lisp/erc/erc-services.el @@ -227,6 +227,8 @@ Example of use: "IDENTIFY" nil nil nil) (freenode "NickServ!NickServ@services." + ;; freenode also accepts a password at login, see the `erc' + ;; :password argument. "/msg\\s-NickServ\\s-IDENTIFY\\s-<password>" "NickServ" "IDENTIFY" nil nil @@ -249,9 +251,11 @@ Example of use: "IDENTIFY" nil "SQUERY" nil) (OFTC "NickServ!services@services.oftc.net" - "type\\s-/msg\\s-NickServ\\s-IDENTIFY\\s- password ." + ;; OFTC's NickServ doesn't ask you to identify anymore. + nil "NickServ" - "IDENTIFY" nil nil nil) + "IDENTIFY" nil nil + "You\\s-are\\s-successfully\\s-identified\\s-as\\s-") (QuakeNet nil nil "Q@CServe.quakenet.org" @@ -334,15 +338,15 @@ If this is the case, run `erc-nickserv-identified-hook'." ;; continue only if we're sure it's the real nickserv for this network ;; and it's told us we've successfully identified (when (and sender (equal sspec sender) + success-regex (string-match success-regex msg)) (erc-log "NickServ IDENTIFY success notification detected") (run-hook-with-args 'erc-nickserv-identified-hook network nick) nil))) (defun erc-nickserv-identify-autodetect (proc parsed) - "Check for a NickServ identify request everytime a notice is received. -Make sure it is the real NickServ for this network and that it has -specifically asked the user to IDENTIFY. + "Identify to NickServ when an identify request is received. +Make sure it is the real NickServ for this network. If `erc-prompt-for-nickserv-password' is non-nil, prompt the user for the password for this nickname, otherwise try to send it automatically." (unless (and (null erc-nickserv-passwords) @@ -356,6 +360,7 @@ password for this nickname, otherwise try to send it automatically." ;; continue only if we're sure it's the real nickserv for this network ;; and it's asked us to identify (when (and sender (equal sspec sender) + identify-regex (string-match identify-regex msg)) (erc-log "NickServ IDENTIFY request detected") (erc-nickserv-call-identify-function nick) |