[Erbot-cvs] erbot erbot.el ChangeLog

[Michael W. Olson]

CVSROOT:        /cvsroot/erbot
Module name:    erbot
Changes by:     Michael W. Olson <mwolson>      06/11/29 03:25:49

Modified files:
        .              : erbot.el ChangeLog 

Log message:
        Revision: address@hidden/erbot--cvs--0--patch-31
        
        Fix a bug when using ERC development branch
        
        * erbot.el (erbot-join-servers): Make this work with the ERC
          development branch.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/erbot/erbot.el?cvsroot=erbot&r1=1.54&r2=1.55
http://cvs.savannah.gnu.org/viewcvs/erbot/ChangeLog?cvsroot=erbot&r1=1.62&r2=1.63

Patches:
Index: erbot.el
===================================================================
RCS file: /cvsroot/erbot/erbot/erbot.el,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -b -r1.54 -r1.55
--- erbot.el    24 Aug 2006 15:11:59 -0000      1.54
+++ erbot.el    29 Nov 2006 03:25:49 -0000      1.55
@@ -870,8 +870,12 @@
 
        (run-hook-with-args 'erc-before-connect server port nick)
        (unless (erc-already-logged-in server port nick)
+         (if (fboundp 'erc-open)
+             (erc-open
+              server port nick user-full-name (not not-connect-arg) passwd)
          (erc
-          server port nick user-full-name (not not-connect-arg) passwd))))))
+            server port nick user-full-name (not not-connect-arg)
+            passwd)))))))
 
 
 (defun erbot-safe-make (line)

Index: ChangeLog
===================================================================
RCS file: /cvsroot/erbot/erbot/ChangeLog,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -b -r1.62 -r1.63
--- ChangeLog   28 Sep 2006 16:22:28 -0000      1.62
+++ ChangeLog   29 Nov 2006 03:25:49 -0000      1.63
@@ -1,3 +1,8 @@
+2006-11-28  Michael Olson  <address@hidden>
+
+       * erbot.el (erbot-join-servers): Make this work with the ERC
+       development branch.
+
 2006-09-28  D Goel  <address@hidden>
 
        * erbc.el (fsi-describe-from-english): smarter self search