* nnkiboze.el (nnkiboze-request-article): Use

  gnus-cache-request-article.
* gnus-group.el (gnus-group-make-kiboze-group): Fix prompt.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9dc8db7..65856f1 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -7,6 +7,10 @@
        (nnkiboze-generate-groups): List groups.
        * gnus-group.el (gnus-group-make-kiboze-group): Use 
        nnkiboze-score-file.
+       
+       * nnkiboze.el (nnkiboze-request-article): Use
+       gnus-cache-request-article.
+       * gnus-group.el (gnus-group-make-kiboze-group): Fix prompt.
 
 2000-07-16 Dmitry Bely <dbely@mail.ru>
 

diff --git a/lisp/gnus-group.el b/lisp/gnus-group.el
index 84ca742..7f973fd 100644 (file)
--- a/lisp/gnus-group.el
+++ b/lisp/gnus-group.el
@@ -2331,7 +2331,7 @@ score file entries for articles to include in the group."
                                          "Match on header: " headers nil t))))
        (setq regexps nil)
        (while (not (equal "" (setq regexp (read-string
-                                           (format "Match on %s (string): "
+                                           (format "Match on %s (regexp): "
                                                    header)))))
          (push (list regexp nil nil 'r) regexps))
        (push (cons header regexps) scores))

diff --git a/lisp/nnkiboze.el b/lisp/nnkiboze.el
index fb826da..d961f84 100644 (file)
--- a/lisp/nnkiboze.el
+++ b/lisp/nnkiboze.el
@@ -98,14 +98,17 @@
       ;; article fetching by message-id at all.
       (nntp-request-article article newsgroup gnus-nntp-server buffer)
     (let* ((header (gnus-summary-article-header article))
-          (xref (mail-header-xref header)))
+          (xref (mail-header-xref header))
+          num group)
       (unless xref
        (error "nnkiboze: No xref"))
       (unless (string-match " \\([^ ]+\\):\\([0-9]+\\)" xref)
        (error "nnkiboze: Malformed xref"))
-      (gnus-request-article (string-to-int (match-string 2 xref))
-                           (match-string 1 xref)
-                           buffer))))
+      (setq num (string-to-int (match-string 2 xref))
+           group (match-string 1 xref))
+      (or (with-current-buffer buffer
+           (gnus-cache-request-article num group))
+         (gnus-request-article num group buffer)))))
 
 (deffoo nnkiboze-request-scan (&optional group server)
   (nnkiboze-generate-group (concat "nnkiboze:" group)))