(modb-standard-message-entity): Avoid infinite

recursive call.

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index 9c23503..633f1c4 100644 (file)
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,3 +1,8 @@
+2004-05-24  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
+
+       * modb-standard.el (modb-standard-message-entity): Avoid infinite
+       recursive call.
+
 2004-05-23  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
 
        * elmo-spam.el (elmo-spam-register-good-messages): Don't call

diff --git a/elmo/modb-standard.el b/elmo/modb-standard.el
index 04487fd..4d69c83 100644 (file)
--- a/elmo/modb-standard.el
+++ b/elmo/modb-standard.el
@@ -482,8 +482,8 @@
   (let ((ret (elmo-get-hash-val
              key
              (modb-standard-entity-map-internal msgdb))))
-    (if (and (eq 'autoload (car-safe ret)) load)
-       (when modb-standard-divide-number
+    (if (eq 'autoload (car-safe ret))
+       (when (and load modb-standard-divide-number)
          (modb-standard-load-entity
           msgdb
           (elmo-msgdb-location msgdb)