* riece-highlight.el (riece-highlight-setup-dialogue): Simplified.

(riece-highlight-setup-channel-list): Simplified.

* riece.el (riece): Enable add-ons just after insinuate them.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1cb7f74..89a4efb 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
 2004-05-21  Daiki Ueno  <ueno@unixuser.org>
 
+       * riece-highlight.el (riece-highlight-setup-dialogue): Simplified.
+       (riece-highlight-setup-channel-list): Simplified.
+
+       * riece.el (riece): Enable add-ons just after insinuate them.
+
        * riece-addon.el (riece-addon-list-enabled-face): New face.
        (riece-addon-list-disabled-face): New face.
        (riece-addon-list-unsupported-face): New face.

diff --git a/lisp/riece-highlight.el b/lisp/riece-highlight.el
index b601d22..eb23ff5 100644 (file)
--- a/lisp/riece-highlight.el
+++ b/lisp/riece-highlight.el
@@ -192,31 +192,16 @@
 (defconst riece-highlight-description
   "Highlight IRC buffers")
 
-(defvar font-lock-support-mode)
 (defun riece-highlight-setup-dialogue ()
   (make-local-variable 'font-lock-defaults)
   (setq font-lock-defaults '(riece-dialogue-font-lock-keywords t))
-  (make-local-variable 'font-lock-verbose)
-  (setq font-lock-verbose nil)
-  (when (boundp 'font-lock-support-mode)
-    (make-local-variable 'font-lock-support-mode)
-    (setq font-lock-support-mode nil))
-  (make-local-hook 'font-lock-mode-hook)
-  (setq font-lock-mode-hook nil)
   (make-local-hook 'after-change-functions)
   (add-hook 'after-change-functions
            'riece-highlight-hide-prefix nil 'local))
 
 (defun riece-highlight-setup-channel-list ()
   (make-local-variable 'font-lock-defaults)
-  (setq font-lock-defaults '(riece-channel-list-font-lock-keywords t))
-  (make-local-variable 'font-lock-verbose)
-  (setq font-lock-verbose nil)
-  (when (boundp 'font-lock-support-mode)
-    (make-local-variable 'font-lock-support-mode)
-    (setq font-lock-support-mode nil))
-  (make-local-hook 'font-lock-mode-hook)
-  (setq font-lock-mode-hook nil))
+  (setq font-lock-defaults '(riece-channel-list-font-lock-keywords t)))
 
 (defun riece-highlight-hide-prefix (start end length)
   (save-excursion

diff --git a/lisp/riece.el b/lisp/riece.el
index 0fec6c9..d096215 100644 (file)
--- a/lisp/riece.el
+++ b/lisp/riece.el
@@ -274,6 +274,7 @@ If optional argument CONFIRM is non-nil, ask which IRC server to connect."
       (let ((pointer riece-addons))
        (while pointer
          (riece-insinuate-addon (car pointer) riece-debug)
+         (riece-enable-addon (car pointer) riece-debug)
          (setq pointer (cdr pointer))))
       (setq riece-addons-insinuated t))
     (if (or confirm (null riece-server))
@@ -303,10 +304,6 @@ If optional argument CONFIRM is non-nil, ask which IRC server to connect."
        (riece-command-open-server (car server-list))
        (setq server-list (cdr server-list))))
     (run-hooks 'riece-startup-hook)
-    (let ((pointer riece-addons))
-      (while pointer
-       (riece-enable-addon (car pointer) riece-debug)
-       (setq pointer (cdr pointer))))
     (message "%s" (substitute-command-keys
                   "Type \\[describe-mode] for help"))))