[Erbot-cvs] erbot ChangeLog erbot.el

[Vivek Dasmohapatra]

CVSROOT: /sources/erbot
Module name: erbot
Changes by: Vivek Dasmohapatra <fledermaus> 07/01/28 01:16:59

Modified files:
. : ChangeLog erbot.el

Log message:
support :keyword parameters for erc version > 5.0

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/erbot/ChangeLog?cvsroot=erbot&r1=1.64&r2=1.65
http://cvs.savannah.gnu.org/viewcvs/erbot/erbot.el?cvsroot=erbot&r1=1.55&r2=1.56

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/erbot/erbot/ChangeLog,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -b -r1.64 -r1.65
--- ChangeLog 27 Jan 2007 11:46:47 -0000 1.64
+++ ChangeLog 28 Jan 2007 01:16:58 -0000 1.65
@@ -1,3 +1,10 @@
[phone] Vivek Dasmohapatra <***@etla.org>
+
+ * erbot.el (erbot-join-servers): `erc' takes :keyword style
+ parameters in emacs22, the old argument list no longer works.
+ Work out which erc version we're using and alter the call
+ appropriately.
+
2007-01-27 Vivek Dasmohapatra <***@etla.org>

* erbutils.el (erbutils-describe-variable): help-button-xref

Index: erbot.el
===================================================================
RCS file: /sources/erbot/erbot/erbot.el,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -b -r1.55 -r1.56
--- erbot.el 29 Nov 2006 03:25:49 -0000 1.55
+++ erbot.el 28 Jan 2007 01:16:58 -0000 1.56
@@ -869,13 +869,22 @@
;; nil nil 'erc-nick-history-list)))

(run-hook-with-args 'erc-before-connect server port nick)
+ (if (string-match "\\(\\<[[:digit:]]+.[[:digit:]]+\\>\\)"
+ erc-version-string)
+ (setq version (string-to-number
+ (match-string 1 erc-version-string)))
+ (setq version 0))
+
(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)
+ (if (<= 5.0 version)
+ (erc :server server
+ :port port
+ :nick nick
+ :password passwd
+ :full-name user-full-name)
(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)