(elmo-search-namazu-index): Fixed the order to

decide index.

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index b882def..f6257e9 100644 (file)
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,3 +1,8 @@
+2005-09-24  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
+
+       * elmo-search.el (elmo-search-namazu-index): Fixed the order to
+       decide index.
+
 2005-09-20  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
 
        * elmo-search.el (elmo-search-engine-alist): Define with defvar;

diff --git a/elmo/elmo-search.el b/elmo/elmo-search.el
index b9c7c4c..3a42805 100644 (file)
--- a/elmo/elmo-search.el
+++ b/elmo/elmo-search.el
@@ -330,12 +330,12 @@ If the value is a list, all elements are used as index paths for namazu."
 
 (defun elmo-search-namazu-index (engine)
   (let* ((param (elmo-search-engine-param-internal engine))
-        (index (cond ((cdr (assoc param
-                                  elmo-search-namazu-index-alias-alist)))
-                     ((eq (length param) 0)
-                      elmo-search-namazu-default-index-path)
-                     (t
-                      param))))
+        (index (cond
+                ((cdr (assoc param elmo-search-namazu-index-alias-alist)))
+                ((and param (> (length param) 0))
+                 param)
+                (t
+                 elmo-search-namazu-default-index-path))))
     (if (listp index)
        (mapcar 'expand-file-name index)
       (expand-file-name index))))