Changes committed gnus/contrib (ChangeLog nnir.el)

Modified: ChangeLog nnir.el

(nnir-run-swish++): Fix typo in doc string.  Move comment on
nnml-use-compressed-files to more suitable place.


Index: ChangeLog
diff -u gnus/contrib/ChangeLog:7.60 gnus/contrib/ChangeLog:7.61
--- ChangeLog:7.60	Mon Apr 14 22:24:44 2008
+++ ChangeLog	Tue Apr 15 23:16:28 2008
@@ -1,3 +1,8 @@
+2008-04-15  Reiner Steib  <[email protected]>
+
+	* nnir.el (nnir-run-swish++): Fix typo in doc string.  Move comment on
+	nnml-use-compressed-files to more suitable place.
+
 2008-04-13  Daniel Pittman  <[email protected]>
 
 	* nnir.el (nnir-run-imap): Add doc string.  Use `nnir-imap-make-query'.
Index: nnir.el
diff -u gnus/contrib/nnir.el:7.25 gnus/contrib/nnir.el:7.26
--- nnir.el:7.25	Sun Apr 13 16:06:54 2008
+++ nnir.el	Tue Apr 15 23:16:28 2008
@@ -1154,11 +1154,11 @@
 ;; - file size
 ;; - group
 (defun nnir-run-swish++ (query server &optional group)
-  "Run given query against swish++.
+  "Run QUERY against swish++.
 Returns a vector of (group name, file name) pairs (also vectors,
 actually).
 
-Tested with swish++ 4.7 on GNU/Linux and with with swish++ 5.0b2 on
+Tested with swish++ 4.7 on GNU/Linux and with swish++ 5.0b2 on
 Windows NT 4.0."
 
   (when group
@@ -1169,6 +1169,10 @@
 	   (groupspec (cdr (assq 'group query)))
 	   (prefix (nnir-read-server-parm 'nnir-swish++-remove-prefix server))
            (artlist nil)
+	   ;; nnml-use-compressed-files might be any string, but probably this
+	   ;; is sufficient.  Note that we can't only use the value of
+	   ;; nnml-use-compressed-files because old articles might have been
+	   ;; saved with a different value.
 	   (article-pattern (if (string= server "nnmaildir:")
 				":[0-9]+"
 			      "^[0-9]+\\(\\.[a-z0-9]+\\)?$"))
@@ -1221,11 +1225,7 @@
 
         ;; don't match directories or inexistent/unreadable files
         (when (and (string-match article-pattern artno)
-		   (file-readable-p filenam))
-	  ;; nnml-use-compressed-files might be any string, but probably this
-	  ;; is sufficient.  Note that we can't only use the value of
-	  ;; nnml-use-compressed-files because old articles might have been
-	  ;; saved with a different value.
+		   (file-readable-p (concat prefix filenam)))
           (when (not (null dirnam))
 
 	    ;; maybe limit results to matching groups.