Synch to No Gnus 200512051345.

diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index 78acf73..2e654db 100644 (file)
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -1,3 +1,11 @@
+2005-12-05  Adrian Aichner  <adrian@xemacs.org>
+
+       * nnir.el: New variable nnir-swish-e-index-files to support
+       multiple swish-e index files.
+       * nnir.el (nnir-swish-e-index-file): Make obsolete.
+       * nnir.el (nnir-swish-e-index-files): New.
+       * nnir.el (nnir-run-swish-e): Use nnir-swish-e-index-files.
+
 2005-05-17  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * nnir.el (nnir): Add :group.

diff --git a/contrib/nnir.el b/contrib/nnir.el
index c786bf2..f42fdf9 100644 (file)
--- a/contrib/nnir.el
+++ b/contrib/nnir.el
@@ -532,18 +532,31 @@ that it is for swish++, not Glimpse."
   :type '(regexp)
   :group 'nnir)
 
-;; Swish-E.  Next three variables Copyright (C) 2000 Christoph Conrad
-;; <christoph.conrad@gmx.de>.
+;; Swish-E.
 ;; URL: http://sunsite.berkeley.edu/SWISH-E/
 ;; New version: http://www.boe.es/swish-e
+;; Variables `nnir-swish-e-index-file', `nnir-swish-e-program' and
+;; `nnir-swish-e-additional-switches'
+;; Copyright (C) 2000 Christoph Conrad <christoph.conrad@gmx.de>.
 
+(make-obsolete-variable 'nnir-swish-e-index-file
+                       'nnir-swish-e-index-files)
 (defcustom nnir-swish-e-index-file
   (expand-file-name "~/Mail/index.swish-e")
   "*Index file for swish-e.
-This could be a server parameter."
+This could be a server parameter.
+It is never consulted once `nnir-swish-e-index-files', which should be
+used instead, has been customized."
   :type '(file)
   :group 'nnir)
 
+(defcustom nnir-swish-e-index-files
+  (list nnir-swish-e-index-file)
+  "*List of index files for swish-e.
+This could be a server parameter."
+  :type '(repeat (file))
+  :group 'nnir)
+
 (defcustom nnir-swish-e-program "swish-e"
   "*Name of swish-e search executable.
 This cannot be a server parameter."
@@ -1196,10 +1209,10 @@ Tested with swish-e-2.0.1 on Windows NT 4.0."
       (erase-buffer)
 
       (message "Doing swish-e query %s..." query)
-      (let* ((index-file
+      (let* ((index-files
              (or (nnir-read-server-parm
-                  'nnir-swish-e-index-file server)
-                 (error "Missing parameter `nnir-swish-e-index-file'")))
+                  'nnir-swish-e-index-files server)
+                 (error "Missing parameter `nnir-swish-e-index-files'")))
             (additional-switches
              (nnir-read-server-parm
               'nnir-swish-e-additional-switches server))
@@ -1207,7 +1220,7 @@ Tested with swish-e-2.0.1 on Windows NT 4.0."
                        nil             ; input from /dev/null
                        t               ; output
                        nil             ; don't redisplay
-                       "-f" ,index-file
+                       "-f" ,@index-files
                        ,@additional-switches
                        "-w"
                        ,qstring        ; the query, in swish-e format