2007-06-21 Nikita Danilov <nikita@clusterfs.com>

	* riece-000.el (riece-handle-001-message): Run
	riece-after-login-hook before joining in startup channels.

	* riece-mcat.el (riece-mcat): Don't load localized messages if
	mule is off.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bdebb66..76295e9 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2007-06-21  Nikita Danilov <nikita@clusterfs.com>
+
+       * riece-000.el (riece-handle-001-message): Run
+       riece-after-login-hook before joining in startup channels.
+
+       * riece-mcat.el (riece-mcat): Don't load localized messages if
+       mule is off.
+
 2007-06-06  Daiki Ueno  <ueno@unixuser.org>
 
        * riece-twitter.el (riece-twitter-set-credential): New command.

diff --git a/lisp/riece-000.el b/lisp/riece-000.el
index 277cae5..bd26fb6 100644 (file)
--- a/lisp/riece-000.el
+++ b/lisp/riece-000.el
@@ -52,6 +52,7 @@
   (if (equal riece-server-name "")
       (message (riece-mcat "Logging in to IRC server...done"))
     (message (riece-mcat "Logging in to %s...done") riece-server-name))
+  (run-hooks 'riece-after-login-hook)
   (let ((channel-list riece-startup-channel-list)
        entry identity)
     (while channel-list
@@ -61,8 +62,7 @@
                  (setq identity (riece-parse-identity (car entry))))
                 riece-server-name)
          (riece-command-join-channel identity (nth 1 entry)))
-      (setq channel-list (cdr channel-list))))
-  (run-hooks 'riece-after-login-hook))
+      (setq channel-list (cdr channel-list)))))
 
 (defun riece-handle-004-message (prefix number name string)
   "RPL_MYINFO \"<umodes> <chnlmodes>\""

diff --git a/lisp/riece-mcat.el b/lisp/riece-mcat.el
index 5c77de6..a2573cd 100644 (file)
--- a/lisp/riece-mcat.el
+++ b/lisp/riece-mcat.el
@@ -26,8 +26,9 @@
 
 (defun riece-mcat (string)
   "Translate STRING in the current language environment."
-  (let ((feature (get-language-info current-language-environment
-                                   'riece-mcat-feature)))
+  (let ((feature (if (featurep 'mule)
+                    (get-language-info current-language-environment
+                                       'riece-mcat-feature))))
     (if feature
        (progn
          (require feature)