* riece.el: Don't require 'riece-filter.

* riece-server.el: Require 'riece-filter.

* riece-500.el: Autoload riece-default-handle-numeric-reply from
"riece-handle".

* riece-400.el: Autoload riece-default-handle-numeric-reply from
"riece-handle".

* riece-300.el: Don't require 'riece-filter; autoload
riece-default-handle-numeric-reply from "riece-handle".

* riece-200.el: Autoload riece-default-handle-numeric-reply from
"riece-handle".

* riece-000.el: Don't require 'riece-filter; autoload
riece-default-handle-numeric-reply from "riece-handle".

* riece-server.el (riece-server-keyword-map): Add :protocol.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e7cb0bc..e85e998 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,24 @@
 2004-07-18  Daiki Ueno  <ueno@unixuser.org>
 
 2004-07-18  Daiki Ueno  <ueno@unixuser.org>
 

+       * riece.el: Don't require 'riece-filter.
+
+       * riece-server.el: Require 'riece-filter.
+
+       * riece-500.el: Autoload riece-default-handle-numeric-reply from
+       "riece-handle".
+
+       * riece-400.el: Autoload riece-default-handle-numeric-reply from
+       "riece-handle".
+
+       * riece-300.el: Don't require 'riece-filter; autoload
+       riece-default-handle-numeric-reply from "riece-handle".
+
+       * riece-200.el: Autoload riece-default-handle-numeric-reply from
+       "riece-handle".
+
+       * riece-000.el: Don't require 'riece-filter; autoload
+       riece-default-handle-numeric-reply from "riece-handle".
+

        * riece-filter.el (riece-filter): Simplified.
 
        * riece-server.el (riece-server-keyword-map): Add :protocol.
        * riece-filter.el (riece-filter): Simplified.
 
        * riece-server.el (riece-server-keyword-map): Add :protocol.

diff --git a/lisp/riece-000.el b/lisp/riece-000.el
index a986907..0894b10 100644 (file)
--- a/lisp/riece-000.el
+++ b/lisp/riece-000.el
@@ -25,12 +25,11 @@
 ;;; Code:
 
 (require 'riece-misc)
 ;;; Code:
 
 (require 'riece-misc)

-(require 'riece-filter)                        ;riece-default-handle-message

 (require 'riece-version)
 (require 'riece-commands)              ;riece-command-join
 
 (eval-when-compile
 (require 'riece-version)
 (require 'riece-commands)              ;riece-command-join
 
 (eval-when-compile

-  (autoload 'riece-default-handle-numeric-reply "riece-filter"))
+  (autoload 'riece-default-handle-numeric-reply "riece-handle"))

 (defun riece-handle-default-000-message (prefix number name string)
   (setq riece-nick-accepted 'ok)
   (riece-default-handle-numeric-reply
 (defun riece-handle-default-000-message (prefix number name string)
   (setq riece-nick-accepted 'ok)
   (riece-default-handle-numeric-reply

diff --git a/lisp/riece-200.el b/lisp/riece-200.el
index e7010ab..8926e24 100644 (file)
--- a/lisp/riece-200.el
+++ b/lisp/riece-200.el
@@ -27,7 +27,7 @@
 (require 'riece-misc)
 
 (eval-when-compile
 (require 'riece-misc)
 
 (eval-when-compile

-  (autoload 'riece-default-handle-numeric-reply "riece-filter"))
+  (autoload 'riece-default-handle-numeric-reply "riece-handle"))

 (defun riece-handle-default-200-message (prefix number name string)
   (riece-default-handle-numeric-reply
    riece-info-prefix prefix number name string))
 (defun riece-handle-default-200-message (prefix number name string)
   (riece-default-handle-numeric-reply
    riece-info-prefix prefix number name string))

diff --git a/lisp/riece-300.el b/lisp/riece-300.el
index 5fcd80c..5f1383e 100644 (file)
--- a/lisp/riece-300.el
+++ b/lisp/riece-300.el
@@ -26,10 +26,8 @@
 
 (require 'riece-misc)
 
 
 (require 'riece-misc)
 

-(require 'riece-filter)                        ;riece-default-handle-message
-

 (eval-when-compile
 (eval-when-compile

-  (autoload 'riece-default-handle-numeric-reply "riece-filter"))
+  (autoload 'riece-default-handle-numeric-reply "riece-handle"))

 (defun riece-handle-default-300-message (prefix number name string)
   (riece-default-handle-numeric-reply
    riece-info-prefix prefix number name string))
 (defun riece-handle-default-300-message (prefix number name string)
   (riece-default-handle-numeric-reply
    riece-info-prefix prefix number name string))

diff --git a/lisp/riece-400.el b/lisp/riece-400.el
index 9681607..014d974 100644 (file)
--- a/lisp/riece-400.el
+++ b/lisp/riece-400.el
@@ -28,7 +28,7 @@
 (require 'riece-misc)
 
 (eval-when-compile
 (require 'riece-misc)
 
 (eval-when-compile

-  (autoload 'riece-default-handle-numeric-reply "riece-filter"))
+  (autoload 'riece-default-handle-numeric-reply "riece-handle"))

 (defun riece-handle-default-400-message (prefix number name string)
   (riece-default-handle-numeric-reply
    riece-error-prefix prefix number name string))
 (defun riece-handle-default-400-message (prefix number name string)
   (riece-default-handle-numeric-reply
    riece-error-prefix prefix number name string))

diff --git a/lisp/riece-500.el b/lisp/riece-500.el
index bf46147..36d1d44 100644 (file)
--- a/lisp/riece-500.el
+++ b/lisp/riece-500.el
@@ -27,7 +27,7 @@
 (require 'riece-misc)
 
 (eval-when-compile
 (require 'riece-misc)
 
 (eval-when-compile

-  (autoload 'riece-default-handle-numeric-reply "riece-filter"))
+  (autoload 'riece-default-handle-numeric-reply "riece-handle"))

 (defun riece-handle-default-500-message (prefix number name string)
   (riece-default-handle-numeric-reply
    riece-error-prefix prefix number name string))
 (defun riece-handle-default-500-message (prefix number name string)
   (riece-default-handle-numeric-reply
    riece-error-prefix prefix number name string))

diff --git a/lisp/riece-server.el b/lisp/riece-server.el
index d7badb8..bac3c99 100644 (file)
--- a/lisp/riece-server.el
+++ b/lisp/riece-server.el
@@ -29,6 +29,7 @@
 (require 'riece-coding)                        ;riece-default-coding-system
 (require 'riece-identity)
 (require 'riece-compat)
 (require 'riece-coding)                        ;riece-default-coding-system
 (require 'riece-identity)
 (require 'riece-compat)

+(require 'riece-filter)

 
 (eval-and-compile
   (defvar riece-server-keyword-map
 
 (eval-and-compile
   (defvar riece-server-keyword-map

diff --git a/lisp/riece.el b/lisp/riece.el
index e264b5e..e1f0ac2 100644 (file)
--- a/lisp/riece.el
+++ b/lisp/riece.el
@@ -24,7 +24,6 @@
 
 ;;; Code:
 
 
 ;;; Code:
 

-(require 'riece-filter)

 (require 'riece-display)
 (require 'riece-server)
 (require 'riece-compat)
 (require 'riece-display)
 (require 'riece-server)
 (require 'riece-compat)