From acafb3290a3f266f8fbdab968bfecbba7dd89ece Mon Sep 17 00:00:00 2001 From: yamaoka Date: Fri, 16 Feb 2001 02:10:49 +0000 Subject: [PATCH] * lisp/gnus-vers.el (gnus-revision-number): Increment to 08. * 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-ja.texi (New features in Gnus 5.8): Remove annotation about `gnus-article-display-hook.' * 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'. --- ChangeLog | 30 ++++++++++++++++++++++++++++++ lisp/gnus-art.el | 5 +---- lisp/gnus-bbdb.el | 2 +- lisp/gnus-sum.el | 42 ++++++++++++++++++++++++++++++------------ lisp/gnus-uu.el | 2 +- lisp/gnus-vers.el | 2 +- lisp/gnus.el | 5 ----- texi/gnus-faq-ja.texi | 14 +++----------- texi/gnus-ja.texi | 3 +-- 9 files changed, 68 insertions(+), 37 deletions(-) diff --git a/ChangeLog b/ChangeLog index 31a4b30..8b5af27 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,33 @@ +2001-02-16 Katsumi Yamaoka + + * lisp/gnus-vers.el (gnus-revision-number): Increment to 08. + + * 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 + + * texi/gnus-ja.texi (New features in Gnus 5.8): Remove annotation + about `gnus-article-display-hook.' + * 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 * lisp/message.el (message-cite-original-without-signature): diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el index 48cabd1..812d0e5 100644 --- a/lisp/gnus-art.el +++ b/lisp/gnus-art.el @@ -3544,7 +3544,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 @@ -3580,9 +3579,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 --- 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 d201b04..00fb567 100644 --- a/lisp/gnus-sum.el +++ b/lisp/gnus-sum.el @@ -4417,14 +4417,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? @@ -5129,8 +5146,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. @@ -7410,7 +7430,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) @@ -7668,7 +7687,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 694757e..6d8448e 100644 --- a/lisp/gnus-uu.el +++ b/lisp/gnus-uu.el @@ -1264,7 +1264,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 61bae29..2595f54 100644 --- a/lisp/gnus-vers.el +++ b/lisp/gnus-vers.el @@ -31,7 +31,7 @@ (require 'product) (provide 'gnus-vers) -(defconst gnus-revision-number "07" +(defconst gnus-revision-number "08" "Revision number for this version of gnus.") ;; Product information of this gnus. diff --git a/lisp/gnus.el b/lisp/gnus.el index 85bf4ed..37f33ce 100644 --- a/lisp/gnus.el +++ b/lisp/gnus.el @@ -1862,11 +1862,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 05fd217..650ab7b 100644 --- a/texi/gnus-faq-ja.texi +++ b/texi/gnus-faq-ja.texi @@ -269,22 +269,14 @@ Q2.1: T-gnus $B$N%P!<%8%g%s$r$"$2$?$i(B BBDB $B$,F0$+$J$/$J$C$F$7$^$$$^$7$?!# Semi-gnus 6.8 $B0J9_$N%P!<%8%g%s$G$O!"%*%j%8%J%k$N(B bbdb-gnus.el $B$OF0:n$7$^(B $B$;$s!#(B $BH$9$k$h$&$K$9$k!#(B $B$b$7!"%*%j%8%J%k$N(B Gnus (September $B0J9_(B) $B$r;H$C$F$$$k$N$G$"$l$P!"$3$NJ}(B $BK!$,NI$$$G$7$g$&!#(B -@item -bbdb/gnus-update-record $B$r(B gnus-article-prepare-hook $B$NBe$j$K(B -gnus-article-display-hook $B$KDI2C$9$k!#(B - -@end enumerate - -a $B$NJ}K!!"$*$h$S(B bbdb-user-mail-names $B$KBP1~$7$?(B BBDB 2.00.01 $B$KBP$9$k(B -patch $B!"4pK\E*$J@_DjNc$,!"(B +$B$3$NJ}K!!"$*$h$S(B bbdb-user-mail-names $B$KBP1~$7$?(B BBDB 2.00.01 $B$KBP$9(B +$B$k(B patch $B!"4pK\E*$J@_DjNc$,!"(B @file{http://www.mdcnet.co.jp/~keiichi/bbdb.shtml} $B$K$"$j$^$9!#(B @item @@ -370,7 +362,7 @@ gnus-posting-style $B$r;HMQ$9$k;v$b$G$-$^$9!#(B @node Mailing list FAQ @subsection $B%a!<%j%s%0%j%9%H(B -@itemize bullet +@itemize @bullet @item Q5.1: $B%a%$%j%s%0!&%j%9%H$+$iC&B`$9$k$K$O(B? diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi index d930a5c..657a346 100644 --- a/texi/gnus-ja.texi +++ b/texi/gnus-ja.texi @@ -19674,8 +19674,7 @@ Sources $B$GF@$k$3$H$,$G$-$^$9!#(B @item Summary $B%P%C%U%!$H(B NOV $B%U%!%$%k$K4^$a$kDI2C$N%X%C%@!<$r!"%f!<%6$,(B $B7h$a$k$3$H$,$G$-$k$h$&$K$J$j$^$7$?!#(B -@item @code{gnus-article-display-hook} $B$,:o=|$5$l$^$7$?(B ($BLuCm(B: T-gnus $B$G(B -$B$OB8:_$7$F$$$^$9$,!"$3$l$r;H$&$3$H$O?d>)$5$l$F$$$^$;$s(B)$B!#Be$o$j(B +@item @code{gnus-article-display-hook} $B$,:o=|$5$l$^$7$?!#Be$o$j(B $B$K(B @code{gnus-treat-} $B$G;O$^$k$?$/$5$s$NJQ?t$,DI2C$5$l$^$7$?!#(B @item Gnus posting styles $B$,:F$S2~Au$5$l$^$7$?!#8=:_$OHyL/$K0c$&5,B'$GF0(B -- 1.7.10.4