# HG changeset patch
# User Glenn Morris <rgm@gnu.org>
# Date 1255709013 0
# Node ID a9352fba1fd2ae03b635cecda23ef76bddc2897f
# Parent  889d12d7c95b51c3b67d628a8a12d5883f6f6a29
(rcirc-authenticate): Simplify previous change.

diff -r 889d12d7c95b -r a9352fba1fd2 lisp/ChangeLog
--- a/lisp/ChangeLog	Fri Oct 16 15:20:51 2009 +0000
+++ b/lisp/ChangeLog	Fri Oct 16 16:03:33 2009 +0000
@@ -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 -r 889d12d7c95b -r a9352fba1fd2 lisp/net/rcirc.el
--- a/lisp/net/rcirc.el	Fri Oct 16 15:20:51 2009 +0000
+++ b/lisp/net/rcirc.el	Fri Oct 16 16:03:33 2009 +0000
@@ -2561,12 +2561,10 @@
 	(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