From c38fbfd480565d95b58a8b09f9864521f2d6e1d6 Mon Sep 17 00:00:00 2001 From: Reiner Steib Date: Tue, 15 Apr 2008 21:16:28 +0000 Subject: [PATCH] (nnir-run-swish++): Fix typo in doc string. Move comment on nnml-use-compressed-files to more suitable place. --- contrib/ChangeLog | 5 +++++ contrib/nnir.el | 14 +++++++------- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/contrib/ChangeLog b/contrib/ChangeLog index ab4a1e775..30cc56329 100644 --- a/contrib/ChangeLog +++ b/contrib/ChangeLog @@ -1,3 +1,8 @@ +2008-04-15 Reiner Steib + + * 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 * nnir.el (nnir-run-imap): Add doc string. Use `nnir-imap-make-query'. diff --git a/contrib/nnir.el b/contrib/nnir.el index 6e5935e03..b436718f3 100644 --- a/contrib/nnir.el +++ b/contrib/nnir.el @@ -1154,11 +1154,11 @@ returning the one at the supplied position." ;; - 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 @@ Windows NT 4.0." (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 @@ Windows NT 4.0." ;; 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. -- 2.25.1