Fixing missing variables and a small bug in org-irc.el.

ChangeLog

@@ -1,3 +1,9 @@
+2008-02-29  Bastien Guerry  <Bastien.Guerry@ens.fr>
+
+	* org-irc.el: Require 'cl and 'erc.  Added dynamically scoped
+	variables.
+	(org-irc-visit-erc): Bug fix: rename `chan' to `chan-name'.
+
 2008-02-29  Bastien Guerry  <bzg@altern.org>
 
 	* org.el (org-export-as-html): Kill buffer after

org-irc.el

@@ -50,13 +50,21 @@
 ;;
 ;;; Code:
 
+(eval-when-compile
+  (require 'cl))
+
 (require 'org)
+(require 'erc)
 
 (defvar org-irc-client 'erc
   "The IRC client to act on")
 (defvar org-irc-link-to-logs nil
   "non-nil will store a link to the logs, nil will store an irc: style link")
 
+(defvar erc-default-port) ; dynamically scoped from erc.el
+(defvar erc-session-port) ; dynamically scoped form erc-backend.el
+(defvar erc-server-announced-name) ; dynamically scoped form erc-backend.el
+
 ;; Generic functions/config (extend these for other clients)
 
 (add-to-list 'org-store-link-functions
@@ -209,7 +217,7 @@ the session itself."
                               (progn
                                 (goto-char (point-max))
                                 (insert (concat nick ": ")))
-                              (error "%s not found in %s" nick chan)))))
+                              (error "%s not found in %s" nick chan-name)))))
                     (progn
                       (switch-to-buffer server-buffer)
                       (erc-cmd-JOIN chan-name))))