(rcirc-authenticate): Simplify previous change.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 89bba0fdca4c8e612a0b84f00715341c82247d76..079cac1afc06429d5b9d70861ca89eb43ed48ffe 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2009-10-16  Glenn Morris  <rgm@gnu.org>
+
+       * net/rcirc.el (rcirc-authenticate): Simplify previous change.
+
 2009-10-16  Toru TSUNEYOSHI  <t_tuneyosi@hotmail.com>
 
        * net/ange-ftp.el (ange-ftp-send-cmd): Handle `size' like `mdtm'.

diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el
index 4bdda0393fdc2eeb461f93aa81815e443fbfcfde..52d97f38b5c59829d8dc0cd7009ba9a3af18f1ef 100644 (file)
--- a/lisp/net/rcirc.el
+++ b/lisp/net/rcirc.el
@@ -2561,12 +2561,10 @@ Passwords are stored in `rcirc-authinfo' (which see)."
        (when (and (string-match server rcirc-server)
                   (string-match nick rcirc-nick))
          (cond ((equal method 'nickserv)
-                (let ((password (car args))
-                      (nickserv-nick (or (cadr args) "nickserv")))
                 (rcirc-send-string
                  process
-                 (concat "PRIVMSG " nickserv-nick " :identify "
-                         password))))
+                 (concat "PRIVMSG " (or (cadr args) "nickserv")
+                          " :identify " (car args))))
                ((equal method 'chanserv)
                 (rcirc-send-string
                  process