From 9d580defa99bf834c67749ed5fa802eb04dfcd7c Mon Sep 17 00:00:00 2001 From: hmurata Date: Sat, 24 Sep 2005 00:02:08 +0000 Subject: [PATCH] (elmo-search-namazu-index): Fixed the order to decide index. --- elmo/ChangeLog | 5 +++++ elmo/elmo-search.el | 12 ++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/elmo/ChangeLog b/elmo/ChangeLog index b882def..f6257e9 100644 --- a/elmo/ChangeLog +++ b/elmo/ChangeLog @@ -1,3 +1,8 @@ +2005-09-24 Hiroya Murata + + * elmo-search.el (elmo-search-namazu-index): Fixed the order to + decide index. + 2005-09-20 Hiroya Murata * 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 --- 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)))) -- 1.7.10.4