[Emacs-diffs] emacs/lisp ChangeLog net/rcirc.el

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       09/10/16 16:03:36

Modified files:
        lisp           : ChangeLog 
        lisp/net       : rcirc.el 

Log message:
        (rcirc-authenticate): Simplify previous change.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16439&r2=1.16440
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/net/rcirc.el?cvsroot=emacs&r1=1.54&r2=1.55

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16439
retrieving revision 1.16440
diff -u -b -r1.16439 -r1.16440
--- ChangeLog   16 Oct 2009 15:20:51 -0000      1.16439
+++ ChangeLog   16 Oct 2009 16:03:33 -0000      1.16440
@@ -1,3 +1,7 @@
+2009-10-16  Glenn Morris  <address@hidden>
+
+       * net/rcirc.el (rcirc-authenticate): Simplify previous change.
+
 2009-10-16  Toru TSUNEYOSHI  <address@hidden>
 
        * net/ange-ftp.el (ange-ftp-send-cmd): Handle `size' like `mdtm'.

Index: net/rcirc.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/net/rcirc.el,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -b -r1.54 -r1.55
--- net/rcirc.el        15 Oct 2009 06:50:38 -0000      1.54
+++ net/rcirc.el        16 Oct 2009 16:03:36 -0000      1.55
@@ -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