* lisp/gnus-agent.el (gnus-category-edit-predicate): Expand `setf'

[elisp/gnus.git-] / lisp / gnus-int.el

diff --git a/lisp/gnus-int.el b/lisp/gnus-int.el
index 7fdadc8..5231a58 100644 (file)
--- a/lisp/gnus-int.el
+++ b/lisp/gnus-int.el
@@ -2,6 +2,7 @@
 ;; Copyright (C) 1996,97,98,99 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
+;;         MORIOKA Tomohiko <morioka@jaist.ac.jp>
 ;; Keywords: news
 
 ;; This file is part of GNU Emacs.
@@ -293,6 +294,43 @@ If FETCH-OLD, retrieve all headers (or some subset thereof) in the group."
               articles (gnus-group-real-name group)
               (nth 1 gnus-command-method) fetch-old))))
 
+(defun gnus-retrieve-parsed-headers (articles group &optional fetch-old
+                                             dependencies force-new)
+  "Request parsed-headers for ARTICLES in GROUP.
+If FETCH-OLD, retrieve all headers (or some subset thereof) in the group."
+  (unless dependencies
+    (setq dependencies
+         (save-excursion
+           (set-buffer gnus-summary-buffer)
+           gnus-newsgroup-dependencies)))
+  (let ((gnus-command-method (gnus-find-method-for-group group))
+       headers)
+    (if (and gnus-use-cache (numberp (car articles)))
+       (setq headers
+             (gnus-cache-retrieve-parsed-headers articles group fetch-old
+                                                 dependencies force-new))
+      (let ((func (gnus-get-function gnus-command-method
+                                    'retrieve-parsed-headers 'no-error)))
+       (if func
+           (setq headers (funcall func articles dependencies
+                                  (gnus-group-real-name group)
+                                  (nth 1 gnus-command-method) fetch-old
+                                  force-new)
+                 gnus-headers-retrieved-by (car headers)
+                 headers (cdr headers))
+         (setq gnus-headers-retrieved-by
+               (funcall
+                (gnus-get-function gnus-command-method 'retrieve-headers)
+                articles (gnus-group-real-name group)
+                (nth 1 gnus-command-method) fetch-old))
+         )))
+    (or headers
+       (if (eq gnus-headers-retrieved-by 'nov)
+           (gnus-get-newsgroup-headers-xover
+            articles nil dependencies gnus-newsgroup-name t)
+         (gnus-get-newsgroup-headers dependencies)))
+    ))
+
 (defun gnus-retrieve-articles (articles group)
   "Request ARTICLES in GROUP."
   (let ((gnus-command-method (gnus-find-method-for-group group)))