2 files changed, 6 insertions, 4 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 89bba0fdca4..079cac1afc0 100644
--- 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 4bdda0393fd..52d97f38b5c 100644
--- 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