[Erbot-cvs] erbot erbot.el

[Vivek Dasmohapatra]

CVSROOT:        /sources/erbot
Module name:    erbot
Changes by:     Vivek Dasmohapatra <fledermaus> 09/09/26 21:31:48

Modified files:
        .              : erbot.el 

Log message:
        erc-nickserv is obsolete, erc-services is the new module

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/erbot/erbot.el?cvsroot=erbot&r1=1.59&r2=1.60

Patches:
Index: erbot.el
===================================================================
RCS file: /sources/erbot/erbot/erbot.el,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -b -r1.59 -r1.60
--- erbot.el    23 Nov 2007 16:31:59 -0000      1.59
+++ erbot.el    26 Sep 2009 21:31:47 -0000      1.60
@@ -1,10 +1,10 @@
 ;;; erbot.el --- Another robot for ERC.
-;; Time-stamp: <2007-11-23 11:30:05 deego>
+;; Time-stamp: <2009-09-26 22:28:50 fledermaus>
 ;; Emacs Lisp Archive entry
 ;; Filename: erbot.el
 ;; Package: erbot
 ;; Authors:  David Edmunston (address@hidden)
-;; Modified by: D. Goel <address@hidden>
+;; Modified by: D. Goel <address@hidden>, V Dasmohapatra <address@hidden>
 ;; Version: 0.0
 ;; URL:  http://www.emacswiki.org/cgi-bin/wiki.pl?ErBot
 ;; Maintainer: Deepak Goel <address@hidden>
@@ -345,7 +345,8 @@
 ")
 
 (when erbot-nickserv-p
-  (require 'erc-nickserv)
+  (require 'erc-nickserv nil t) ;; old erc 
+  (require 'erc-services nil t) ;; erc from emacs22
   (erc-nickserv-mode 1)
   )