[Erc-commit] [commit][master] erc-nickserv-identify-autodetect: Make sure identify-regex is non-nil.

[mwolson]

commit af6f378da1ae2ba17d4502aebd59fab7f46a4716
Author: Diane Murray <address@hidden>
Date:   Sun Dec 16 18:19:59 2007 +0100

    erc-nickserv-identify-autodetect: Make sure identify-regex is non-nil.
    
    (erc-nickserv-identify-autodetect): Make sure identify-regex is
    non-nil.  Doc fix.

diff --git a/ChangeLog b/ChangeLog
index e77c933..53cbede 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,8 @@
        added identified regexp for OFTC.
        (erc-nickserv-identification-autodetect): Make sure success-regex
        is non-nil.
+       (erc-nickserv-identify-autodetect): Make sure identify-regex is
+       non-nil.  Doc fix.
 
 2007-12-13  Diane Murray  <address@hidden>
 
diff --git a/erc-services.el b/erc-services.el
index be3fb88..3635981 100644
--- a/erc-services.el
+++ b/erc-services.el
@@ -345,9 +345,8 @@ If this is the case, run `erc-nickserv-identified-hook'."
       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)
@@ -361,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)