Mercurial > emacs
changeset 105637:a9352fba1fd2
(rcirc-authenticate): Simplify previous change.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Fri, 16 Oct 2009 16:03:33 +0000 |
| parents | 889d12d7c95b |
| children | a8e941c41659 |
| files | lisp/ChangeLog lisp/net/rcirc.el |
| diffstat | 2 files changed, 6 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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'.
--- 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