Synch to No Gnus 200403150943.

diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index 1a879fb..623a09b 100644 (file)
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -1,3 +1,8 @@
+2004-03-15  Reiner Steib  <Reiner.Steib@gmx.de>
+
+       * nnir.el (nnir-run-swish-e): Fixed typo.  From Adrian Lanz
+       <lanz@fowi.ethz.ch> (tiny change).
+
 2004-01-23  Jesper Harder  <harder@ifa.au.dk>
 
        * README: update.

diff --git a/contrib/nnir.el b/contrib/nnir.el
index cf5717a..7878435 100644 (file)
--- a/contrib/nnir.el
+++ b/contrib/nnir.el
@@ -298,7 +298,7 @@
 
 ;;; Setup Code:
 
-(defconst nnir-version "$Id: nnir.el,v 1.1.6.1.4.1 2004-01-17 00:28:17 yamaoka Exp $"
+(defconst nnir-version "$Id: nnir.el,v 1.1.6.1.4.2 2004-03-15 09:46:13 yamaoka Exp $"
   "Version of NNIR.")
 
 (require 'cl)
@@ -1194,7 +1194,7 @@ Tested with swish-e-2.0.1 on Windows NT 4.0."
                  (error "Missing parameter `nnir-swish-e-index-file'")))
             (additional-switches
              (nnir-read-server-parm
-              'nnir-swish++-additional-switches server))
+              'nnir-swish-e-additional-switches server))
             (cp-list `(,nnir-swish-e-program
                        nil             ; input from /dev/null
                        t               ; output