Synch up with the trunk.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b7cde81..9449b39 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2003-06-04  Yoichi NAKAYAMA  <yoichi@geiin.org>
+
+       * riece-000.el,riece-200.el,riece-300.el,riece-400.el,riece-500.el,
+       riece-commands.el,riece-filter.el,riece-handle.el,riece-highlight.el
+       riece-identity.el,riece-message.el,riece-misc.el,riece-naming.el,
+       riece.el: Don't require riece-inlines since it has been removed.
+
 2003-06-03  Daiki Ueno  <ueno@unixuser.org>
 
        * riece-display.el (riece-update-user-list-buffer): Rename from

diff --git a/lisp/riece-000.el b/lisp/riece-000.el
index 2d6eab6..fde11c4 100644 (file)
--- a/lisp/riece-000.el
+++ b/lisp/riece-000.el
@@ -24,8 +24,6 @@
 
 ;;; Code:
 
-(eval-when-compile (require 'riece-inlines))
-
 (require 'riece-misc)
 (require 'riece-filter)                        ;riece-default-handle-message
 (require 'riece-version)

diff --git a/lisp/riece-200.el b/lisp/riece-200.el
index 527867b..d25da7e 100644 (file)
--- a/lisp/riece-200.el
+++ b/lisp/riece-200.el
@@ -24,8 +24,6 @@
 
 ;;; Code:
 
-(eval-when-compile (require 'riece-inlines))
-
 (require 'riece-misc)
 (require 'riece-commands)
 

diff --git a/lisp/riece-300.el b/lisp/riece-300.el
index f52881b..da7b073 100644 (file)
--- a/lisp/riece-300.el
+++ b/lisp/riece-300.el
@@ -24,8 +24,6 @@
 
 ;;; Code:
 
-(eval-when-compile (require 'riece-inlines))
-
 (require 'riece-misc)
 (require 'riece-commands)
 

diff --git a/lisp/riece-400.el b/lisp/riece-400.el
index 6434ebc..5a45b66 100644 (file)
--- a/lisp/riece-400.el
+++ b/lisp/riece-400.el
@@ -24,8 +24,6 @@
 
 ;;; Code:
 
-(eval-when-compile (require 'riece-inlines))
-
 (require 'riece-globals)
 (require 'riece-misc)
 

diff --git a/lisp/riece-500.el b/lisp/riece-500.el
index 3589df9..bf46147 100644 (file)
--- a/lisp/riece-500.el
+++ b/lisp/riece-500.el
@@ -24,8 +24,6 @@
 
 ;;; Code:
 
-(eval-when-compile (require 'riece-inlines))
-
 (require 'riece-misc)
 
 (eval-when-compile

diff --git a/lisp/riece-commands.el b/lisp/riece-commands.el
index 7f9f654..2b32033 100644 (file)
--- a/lisp/riece-commands.el
+++ b/lisp/riece-commands.el
@@ -24,8 +24,6 @@
 
 ;;; Code:
 
-(eval-when-compile (require 'riece-inlines))
-
 (require 'riece-channel)
 (require 'riece-complete)
 (require 'riece-display)

diff --git a/lisp/riece-filter.el b/lisp/riece-filter.el
index 06a5137..c6eba72 100644 (file)
--- a/lisp/riece-filter.el
+++ b/lisp/riece-filter.el
@@ -24,8 +24,6 @@
 
 ;;; Code:
 
-(eval-when-compile (require 'riece-inlines))
-
 (require 'riece-handle)
 (require 'riece-misc)
 (require 'riece-server)                        ;riece-close-server

diff --git a/lisp/riece-handle.el b/lisp/riece-handle.el
index 89ecbee..371c407 100644 (file)
--- a/lisp/riece-handle.el
+++ b/lisp/riece-handle.el
@@ -24,8 +24,6 @@
 
 ;;; Code:
 
-(eval-when-compile (require 'riece-inlines))
-
 (require 'riece-misc)
 (require 'riece-message)
 (require 'riece-channel)

diff --git a/lisp/riece-highlight.el b/lisp/riece-highlight.el
index 3c3536d..76ff4a4 100644 (file)
--- a/lisp/riece-highlight.el
+++ b/lisp/riece-highlight.el
@@ -24,8 +24,6 @@
 
 ;;; Code:
 
-(eval-when-compile (require 'riece-inlines))
-
 (require 'riece-globals)
 (require 'font-lock)
 

diff --git a/lisp/riece-identity.el b/lisp/riece-identity.el
index 69f742d..8f5c39d 100644 (file)
--- a/lisp/riece-identity.el
+++ b/lisp/riece-identity.el
@@ -24,8 +24,6 @@
 
 ;;; Code:
 
-(eval-when-compile (require 'riece-inlines))
-
 (require 'riece-globals)
 
 (defun riece-find-server-name ()
@@ -72,7 +70,7 @@
 
 (defun riece-identity-equal (ident1 ident2)
   "Return t, if IDENT1 and IDENT2 is equal."
-  (and (scandinavian-equal-ignore-case
+  (and (riece-identity-equal-no-server
        (riece-identity-prefix ident1)
        (riece-identity-prefix ident2))
        (equal

diff --git a/lisp/riece-message.el b/lisp/riece-message.el
index bf28310..073710c 100644 (file)
--- a/lisp/riece-message.el
+++ b/lisp/riece-message.el
@@ -23,8 +23,6 @@
 
 ;;; Code:
 
-(eval-when-compile (require 'riece-inlines))
-
 (require 'riece-identity)
 (require 'riece-channel)
 (require 'riece-user)

diff --git a/lisp/riece-misc.el b/lisp/riece-misc.el
index bc68892..9d2d735 100644 (file)
--- a/lisp/riece-misc.el
+++ b/lisp/riece-misc.el
@@ -24,8 +24,6 @@
 
 ;;; Code:
 
-(eval-when-compile (require 'riece-inlines))
-
 (require 'riece-options)
 (require 'riece-coding)
 (require 'riece-identity)

diff --git a/lisp/riece-naming.el b/lisp/riece-naming.el
index 7828605..51f8029 100644 (file)
--- a/lisp/riece-naming.el
+++ b/lisp/riece-naming.el
@@ -24,8 +24,6 @@
 
 ;;; Code:
 
-(eval-when-compile (require 'riece-inlines))
-
 (require 'riece-globals)
 (require 'riece-channel)
 (require 'riece-user)

diff --git a/lisp/riece.el b/lisp/riece.el
index b8fe057..e0746b1 100644 (file)
--- a/lisp/riece.el
+++ b/lisp/riece.el
@@ -24,8 +24,6 @@
 
 ;;; Code:
 
-(eval-when-compile (require 'riece-inlines))
-
 (if (featurep 'xemacs)
     (require 'riece-xemacs)
   (require 'riece-emacs))