* lisp/gnus-vers.el (gnus-revision-number): Increment to 03.

* lisp/gnus-sum.el (gnus-get-newsgroup-headers-xover): Don't use
 `gnus-retrieve-parsed-headers' when the backend is nnimap.
(gnus-select-newsgroup): Ditto.

* texi/gnus-faq-ja.texi (Q2.1): Remove mention of `gnus-article-display-hook.'

* lisp/gnus.el (gnus-article-display-hook): Abolished.

* lisp/gnus-uu.el (gnus-uu-grab-articles): Don't care about
 `gnus-article-display-hook'.
* lisp/gnus-sum.el (gnus-summary-show-article): Ditto.
(gnus-summary-search-article): Ditto.

* lisp/gnus-bbdb.el (gnus-bbdb-insinuate): Use `gnus-article-prepare-hook'
 instead of `gnus-article-display-hook'.

* lisp/gnus-art.el (gnus-article-prepare-display): Evaluate
 `gnus-article-prepare-hook' after an article has been prepared;
 don't evaluate `gnus-article-display-hook'.

diff --git a/ChangeLog b/ChangeLog
index 99146cd..893b0a5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,31 @@
+2001-02-16  Katsumi Yamaoka <yamaoka@jpl.org>
+
+       * lisp/gnus-vers.el (gnus-revision-number): Increment to 03.
+
+       * lisp/gnus-sum.el (gnus-get-newsgroup-headers-xover): Don't use
+       `gnus-retrieve-parsed-headers' when the backend is nnimap.  It is
+       only a temporary fix for an infloop on nnimap.  FIXME!!!
+       (gnus-select-newsgroup): Ditto.
+
+2001-02-16  Katsumi Yamaoka <yamaoka@jpl.org>
+
+       * texi/gnus-faq-ja.texi (Q2.1): Remove mention of
+       `gnus-article-display-hook.'
+
+       * lisp/gnus.el (gnus-article-display-hook): Abolished.
+
+       * lisp/gnus-uu.el (gnus-uu-grab-articles): Don't care about
+       `gnus-article-display-hook'.
+       * lisp/gnus-sum.el (gnus-summary-show-article): Ditto.
+       (gnus-summary-search-article): Ditto.
+
+       * lisp/gnus-bbdb.el (gnus-bbdb-insinuate): Use
+       `gnus-article-prepare-hook' instead of `gnus-article-display-hook'.
+
+       * lisp/gnus-art.el (gnus-article-prepare-display): Evaluate
+       `gnus-article-prepare-hook' after an article has been prepared;
+       don't evaluate `gnus-article-display-hook'.
+
 2001-02-15  Katsumi Yamaoka <yamaoka@jpl.org>
 
        * lisp/message.el (message-cite-original-without-signature):

diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index b38c55f..5e5ecc8 100644 (file)
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -3236,7 +3236,6 @@ If ALL-HEADERS is non-nil, no headers are hidden."
   "Make the current buffer look like a nice article."
   (setq gnus-article-wash-types nil)
   (gnus-run-hooks 'gnus-tmp-internal-hook)
-  (gnus-run-hooks 'gnus-article-prepare-hook)
   ;; Display message.
   (let (mime-display-header-hook mime-display-text/plain-hook)
     (funcall (if gnus-show-mime
@@ -3272,9 +3271,7 @@ If ALL-HEADERS is non-nil, no headers are hidden."
        (narrow-to-region (point) (point-max))
        (gnus-treat-article nil))
       (put-text-property (point-min) (point-max) 'read-only nil)))
-  ;; Perform the article display hooks.  Incidentally, this hook is
-  ;; an obsolete variable by now.
-  (gnus-run-hooks 'gnus-article-display-hook))
+  (gnus-run-hooks 'gnus-article-prepare-hook))
 
 (defun gnus-article-decode-article-as-default-mime-charset ()
   "Decode an article as `default-mime-charset'.  It won't work if the

diff --git a/lisp/gnus-bbdb.el b/lisp/gnus-bbdb.el
index 9214edf..dd14068 100644 (file)
--- a/lisp/gnus-bbdb.el
+++ b/lisp/gnus-bbdb.el
@@ -592,7 +592,7 @@ beginning of the message headers."
   (when (boundp 'bbdb-extract-field-value-function-list)
     (add-to-list 'bbdb-extract-field-value-function-list
                 'gnus-bbdb/extract-field-value-init))
-  (add-hook 'gnus-article-display-hook 'gnus-bbdb/update-record)
+  (add-hook 'gnus-article-prepare-hook 'gnus-bbdb/update-record)
   (add-hook 'gnus-save-newsrc-hook 'bbdb-offer-save)
   (define-key gnus-summary-mode-map ":" 'gnus-bbdb/show-sender)
   (define-key gnus-summary-mode-map ";" 'gnus-bbdb/edit-notes)

diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index 3bd9ba0..aff77fe 100644 (file)
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -4228,14 +4228,31 @@ If SELECT-ARTICLES, only select those articles from GROUP."
       ;; Retrieve the headers and read them in.
       (gnus-message 5 "Fetching headers for %s..." gnus-newsgroup-name)
       (setq gnus-newsgroup-headers
-           (gnus-retrieve-parsed-headers
-            articles gnus-newsgroup-name
-            ;; We might want to fetch old headers, but
-            ;; not if there is only 1 article.
-            (and (or (and (not (eq gnus-fetch-old-headers 'some))
-                          (not (numberp gnus-fetch-old-headers)))
-                     (> (length articles) 1))
-                 gnus-fetch-old-headers)))
+           ;;;!!! FIXME: temporary fix for an infloop on nnimap.
+           (if (eq 'nnimap (car (gnus-find-method-for-group group)))
+               (if (eq 'nov
+                       (setq
+                        gnus-headers-retrieved-by
+                        (gnus-retrieve-headers
+                         articles gnus-newsgroup-name
+                         ;; We might want to fetch old headers, but
+                         ;; not if there is only 1 article.
+                         (and (or (and
+                                   (not (eq gnus-fetch-old-headers 'some))
+                                   (not (numberp gnus-fetch-old-headers)))
+                                  (> (length articles) 1))
+                              gnus-fetch-old-headers))))
+                   (gnus-get-newsgroup-headers-xover
+                    articles nil nil gnus-newsgroup-name t)
+                 (gnus-get-newsgroup-headers))
+             (gnus-retrieve-parsed-headers
+              articles gnus-newsgroup-name
+              ;; We might want to fetch old headers, but
+              ;; not if there is only 1 article.
+              (and (or (and (not (eq gnus-fetch-old-headers 'some))
+                            (not (numberp gnus-fetch-old-headers)))
+                       (> (length articles) 1))
+                   gnus-fetch-old-headers))))
       (gnus-message 5 "Fetching headers for %s...done" gnus-newsgroup-name)
 
       ;; Suppress duplicates?
@@ -4940,8 +4957,11 @@ Return a list of headers that match SEQUENCE (see
        (let ((gnus-nov-is-evil t))
          (nconc
           (nreverse headers)
-          (gnus-retrieve-parsed-headers sequence group)
-          ))))))
+          ;;;!!! FIXME: temporary fix for an infloop on nnimap.
+          (if (eq 'nnimap (car (gnus-find-method-for-group group)))
+              (when (gnus-retrieve-headers sequence group)
+                (gnus-get-newsgroup-headers))
+            (gnus-retrieve-parsed-headers sequence group))))))))
 
 (defun gnus-article-get-xrefs ()
   "Fill in the Xref value in `gnus-current-headers', if necessary.
@@ -7184,7 +7204,6 @@ Optional argument BACKWARD means do search for backward.
   (require 'gnus-async)
   (require 'gnus-art)
   (let ((gnus-select-article-hook nil) ;Disable hook.
-       (gnus-article-display-hook nil)
        (gnus-article-prepare-hook nil)
        (gnus-mark-article-hook nil)    ;Inhibit marking as read.
        (gnus-use-article-prefetch nil)
@@ -7435,7 +7454,6 @@ without any article massaging functions being run."
     (require 'gnus-art)
     ;; Bind the article treatment functions to nil.
     (let ((gnus-have-all-headers t)
-         gnus-article-display-hook
          gnus-article-prepare-hook
          gnus-article-decode-hook
          gnus-break-pages

diff --git a/lisp/gnus-uu.el b/lisp/gnus-uu.el
index 993914b..4c0cc90 100644 (file)
--- a/lisp/gnus-uu.el
+++ b/lisp/gnus-uu.el
@@ -1239,7 +1239,7 @@ When called interactively, prompt for REGEXP."
        (gnus-inhibit-treatment t)
        has-been-begin article result-file result-files process-state
        gnus-summary-display-article-function
-       gnus-article-display-hook gnus-article-prepare-hook gnus-display-mime-function
+       gnus-article-prepare-hook gnus-display-mime-function
        article-series files)
 
     (while (and articles

diff --git a/lisp/gnus-vers.el b/lisp/gnus-vers.el
index f5003c7..b11c348 100644 (file)
--- a/lisp/gnus-vers.el
+++ b/lisp/gnus-vers.el
@@ -31,7 +31,7 @@
 (require 'product)
 (provide 'gnus-vers)
 
-(defconst gnus-revision-number "02"
+(defconst gnus-revision-number "03"
   "Revision number for this version of gnus.")
 
 ;; Product information of this gnus.

diff --git a/lisp/gnus.el b/lisp/gnus.el
index 52e9055..3889f77 100644 (file)
--- a/lisp/gnus.el
+++ b/lisp/gnus.el
@@ -1708,11 +1708,6 @@ gnus-newsrc-hashtb should be kept so that both hold the same information.")
 
 (defvar gnus-dead-summary nil)
 
-(defvar gnus-article-display-hook nil
-  "Controls how the article buffer will look.  This is an obsolete variable;
-use the article treating faculties instead.  Is is described in Info node
-`Customizing Articles'.")
-
 (defvar gnus-invalid-group-regexp "[: `'\"/]\\|^$"
   "Regexp matching invalid groups.")
 

diff --git a/texi/gnus-faq-ja.texi b/texi/gnus-faq-ja.texi
index d145c7f..9857457 100644 (file)
--- a/texi/gnus-faq-ja.texi
+++ b/texi/gnus-faq-ja.texi
@@ -269,22 +269,14 @@ Q2.1: T-gnus \e$B$N%P!<%8%g%s$r$"$2$?$i\e(B BBDB \e$B$,F0$+$J$/$J$C$F$7$^$$$^$7$?!#
 Semi-gnus 6.8 \e$B0J9_$N%P!<%8%g%s$G$O!"%*%j%8%J%k$N\e(B bbdb-gnus.el \e$B$OF0:n$7$^\e(B
 \e$B$;$s!#\e(B \e$B<!$N$h$&$KBP1~$7$F$/$@$5$$!#\e(B
 
-@enumerate a
-@item
 bbdb-gnus.el \e$B$G!"\e(B gnus-article-buffer \e$B$NBe$j$K\e(B
 gnus-original-article-buffer \e$B$r;2>H$9$k$h$&$K$9$k!#\e(B
 
 \e$B$b$7!"%*%j%8%J%k$N\e(B Gnus (September \e$B0J9_\e(B) \e$B$r;H$C$F$$$k$N$G$"$l$P!"$3$NJ}\e(B
 \e$BK!$,NI$$$G$7$g$&!#\e(B
 
-@item
-bbdb/gnus-update-record \e$B$r\e(B gnus-article-prepare-hook \e$B$NBe$j$K\e(B
-gnus-article-display-hook \e$B$KDI2C$9$k!#\e(B
-
-@end enumerate
-
-a \e$B$NJ}K!!"$*$h$S\e(B bbdb-user-mail-names \e$B$KBP1~$7$?\e(B BBDB 2.00.01 \e$B$KBP$9$k\e(B
-patch \e$B!"4pK\E*$J@_DjNc$,!"\e(B
+\e$B$3$NJ}K!!"$*$h$S\e(B bbdb-user-mail-names \e$B$KBP1~$7$?\e(B BBDB 2.00.01 \e$B$KBP$9\e(B
+\e$B$k\e(B patch \e$B!"4pK\E*$J@_DjNc$,!"\e(B
 @file{http://www.mdcnet.co.jp/~keiichi/bbdb.shtml} \e$B$K$"$j$^$9!#\e(B
 
 @item
@@ -370,7 +362,7 @@ gnus-posting-style \e$B$r;HMQ$9$k;v$b$G$-$^$9!#\e(B
 @node Mailing list FAQ
 @subsection \e$B%a!<%j%s%0%j%9%H\e(B
 
-@itemize bullet
+@itemize @bullet
 @item
 Q5.1: \e$B%a%$%j%s%0!&%j%9%H$+$iC&B`$9$k$K$O\e(B?