Synchronize with the branch `t-gnus-6_15-quimby'.

diff --git a/ChangeLog b/ChangeLog
index 97637a5..47f7707 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2001-06-18  Katsumi Yamaoka <yamaoka@jpl.org>
 
+       * lisp/nnshimbun.el (nnshimbun-find-parameter): Use the value of
+       `nnshimbun-pre-fetch-article' if the value of the group parameter
+       `prefetch-articles' is `off'; do likewise for `encapsulate-images'.
+
+2001-06-18  Katsumi Yamaoka <yamaoka@jpl.org>
+
        * lisp/nnshimbun.el (nnshimbun-encapsulate-images): Fix a
        doc-string that both the values `off' and nil specifies not to
        encapsulate images.

diff --git a/lisp/nnshimbun.el b/lisp/nnshimbun.el
index 2575167..28a75c8 100644 (file)
--- a/lisp/nnshimbun.el
+++ b/lisp/nnshimbun.el
@@ -236,15 +236,21 @@ GROUP has a full name."
                           'index-range)
                nnshimbun-index-range))
          ((eq 'prefetch-articles (eval symbol))
-          `(let ((v (or (plist-get (nnshimbun-find-group-parameters ,name)
-                                   'prefetch-articles)
-                        nnshimbun-pre-fetch-article)))
-             (if (eq v 'off) nil v)))
+          `(let ((val (plist-get (nnshimbun-find-group-parameters ,name)
+                                 'prefetch-articles)))
+             (if (memq val '(off nil))
+                 (if (memq nnshimbun-pre-fetch-article '(off nil))
+                     nil
+                   nnshimbun-pre-fetch-article)
+               val)))
          ((eq 'encapsulate-images (eval symbol))
-          `(let ((v (or (plist-get (nnshimbun-find-group-parameters ,name)
-                                   'encapsulate-images)
-                        nnshimbun-encapsulate-images)))
-             (if (eq v 'off) nil v)))
+          `(let ((val (plist-get (nnshimbun-find-group-parameters ,name)
+                                 'encapsulate-images)))
+             (if (memq val '(off nil))
+                 (if (memq nnshimbun-encapsulate-images '(off nil))
+                     nil
+                   nnshimbun-encapsulate-images)
+               val)))
          ((eq 'expiry-wait (eval symbol))
           (if full-name-p
               `(or (plist-get (nnshimbun-find-group-parameters ,group)

diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi
index 1120956..9a7a103 100644 (file)
--- a/texi/gnus-ja.texi
+++ b/texi/gnus-ja.texi
@@ -12683,7 +12683,8 @@ an_egroup RET egroups RET www.egroups.comRET your@@email.address RET}\e$B!#\e(B
 \e$B%j%9%H$G!"Nc$($P<!$N$h$&$JCM$G$9!#\e(B
 
 @example
-  '(index-range all prefetch-articles t expiry-wait 6)
+  '(index-range all prefetch-articles off encapsulate-images on
+               expiry-wait 6)
 @end example
 
 \e$B<B:]$K$O$3$N$h$&$J%j%9%H$N@hF,$K\e(B @code{nnshimbun-group-parameters} \e$B$H$$\e(B
@@ -12693,28 +12694,30 @@ an_egroup RET egroups RET www.egroups.comRET your@@email.address RET}\e$B!#\e(B
 @table @code
 @item prefetch-articles
 @vindex nnshimbun-pre-fetch-article
-\e$B$3$N%0%k!<%W%Q%i%a!<%?$,\e(B @code{nil} \e$B0J30$NCM$K%;%C%H$5$l$F$$$k%0%k!<%W$G\e(B
-\e$B$O!"\e(B@code{nnshimbun} \e$B$O?7Ce5-;v$r8!:w$HF1;~$K5-;v$N%@%&%s%m!<%I$b9T$$$^\e(B
-\e$B$9!#$3$l$K$h$C$F?7Ce5-;v$N8!:w$OCY$/$J$j$^$9$,!"5-;v$N1\Mw;~$KBT$?$5$l$k\e(B
-\e$B$3$H$O>/$J$/$J$j$^$9!#$b$7!"JQ\e(B
-\e$B?t\e(B @code{nnshimbun-pre-fetch-article} \e$B$,\e(B @code{nil} \e$B0J30$NCM$K%;%C%H$5$l\e(B
-\e$B$F$$$?$J$i$P!"%0%k!<%W%Q%i%a!<%?\e(B @code{prefetch-articles} \e$B$,@_Dj$5$l$F$$\e(B
-\e$B$J$$$+!"$=$NCM$,\e(B @code{nil} \e$B$K$J$C$F$$$k%0%k!<%W$G$b!"A0$b$C$F5-;v$N%@%&\e(B
-\e$B%s%m!<%I$r9T$J$$$^$9!#JQ?t\e(B @code{nnshimbun-pre-fetch-article} \e$B$N%G%#%U%)\e(B
-\e$B%k%HCM$O\e(B @code{nil} \e$B$G$9!#\e(B
+\e$B$3$N%0%k!<%W%Q%i%a!<%?$,\e(B @code{off} \e$B$^$?$O\e(B @code{nil} \e$B0J30$NCM$K%;%C%H$5\e(B
+\e$B$l$F$$$k%0%k!<%W$G$O!"\e(B@code{nnshimbun} \e$B$O?7Ce5-;v$r8!:w$HF1;~$K5-;v$N%@\e(B
+\e$B%&%s%m!<%I$b9T$$$^$9!#$3$l$K$h$C$F?7Ce5-;v$N8!:w$OCY$/$J$j$^$9$,!"5-;v$N\e(B
+\e$B1\Mw;~$KBT$?$5$l$k$3$H$O>/$J$/$J$j$^$9!#$b$7!"JQ\e(B
+\e$B?t\e(B @code{nnshimbun-pre-fetch-article} \e$B$,\e(B @code{off} \e$B$^$?$O\e(B @code{nil} \e$B0J\e(B
+\e$B30$NCM$K%;%C%H$5$l$F$$$?$J$i$P!"%0%k!<%W%Q%i%a!<\e(B
+\e$B%?\e(B @code{prefetch-articles} \e$B$,@_Dj$5$l$F$$$J$$$+!"$=$NCM$,\e(B @code{off} \e$B$^\e(B
+\e$B$?$O\e(B @code{nil} \e$B$K$J$C$F$$$k%0%k!<%W$G$b!"A0$b$C$F5-;v$N%@%&%s%m!<%I$r9T\e(B
+\e$B$J$$$^$9!#JQ?t\e(B @code{nnshimbun-pre-fetch-article} \e$B$N%G%#%U%)%k%HCM\e(B
+\e$B$O\e(B @code{off} \e$B$G$9!#\e(B
 
 @item encapsulate-images
 @vindex nnshimbun-encapsulate-images
-\e$B$3$N%0%k!<%W%Q%i%a!<%?$,\e(B @code{nil} \e$B0J30$NCM$K%;%C%H$5$l$F$$$k%0%k!<%W$G\e(B
-\e$B$O!"\e(B@code{nnshimbun} \e$B$O85$K5-;v$KKd$a9~$^$l$F$$$k2hA|%G!<%?\e(B
-\e$B$r\e(B @samp{multipart/related} \e$B$N7A<0$G5-;v$K$O$a9~$_$^$9!#$b$7!"JQ\e(B
-\e$B?t\e(B @code{nnshimbun-encapsulate-images} \e$B$,\e(B @code{nil} \e$B0J30$NCM$K%;%C%H$5\e(B
-\e$B$l$F$$$?$J$i$P!"%0%k!<%W%Q%i%a!<%?\e(B @code{encapsulate-images} \e$B$,@_Dj$5$l\e(B
-\e$B$F$$$J$$$+!"$=$NCM$,\e(B @code{nil} \e$B$K$J$C$F$$$k%0%k!<%W$G$b!"2hA|%G!<%?$r\e(B
-@samp{multipart/related} \e$B$N7A<0$G5-;v$K$O$a9~$_$^$9!#JQ\e(B
-\e$B?t\e(B @code{nnshimbun-encapsulate-images} \e$B$N%G%#%U%)%k%HCM\e(B
-\e$B$O!"\e(B@code{shimbun} \e$B%i%$%V%i%j$NJQ?t\e(B @code{shimbun-encapsulate-images} \e$B$N\e(B
-\e$BCM$G$9\e(B (\e$B$?$V$s$=$N%G%#%U%)%k%HCM$O\e(B @code{t} \e$B$G$9\e(B)\e$B!#\e(B
+\e$B$3$N%0%k!<%W%Q%i%a!<%?$,\e(B @code{off} \e$B$^$?$O\e(B @code{nil} \e$B0J30$NCM$K%;%C%H$5\e(B
+\e$B$l$F$$$k%0%k!<%W$G$O!"\e(B@code{nnshimbun} \e$B$O85$N5-;v$KKd$a9~$^$l$F$$$k2hA|\e(B
+\e$B%G!<%?$r\e(B @samp{multipart/related} \e$B$N7A<0$G5-;v$K$O$a9~$_$^$9!#$b$7!"JQ\e(B
+\e$B?t\e(B @code{nnshimbun-encapsulate-images} \e$B$,\e(B @code{off} \e$B$^$?\e(B
+\e$B$O\e(B @code{nil} \e$B0J30$NCM$K%;%C%H$5$l$F$$$?$J$i$P!"%0%k!<%W%Q%i%a!<\e(B
+\e$B%?\e(B @code{encapsulate-images} \e$B$,@_Dj$5$l$F$$$J$$$+!"$=$NCM\e(B
+\e$B$,\e(B @code{off} \e$B$^$?$O\e(B @code{nil} \e$B$K$J$C$F$$$k%0%k!<%W$G$b!"2hA|%G!<%?\e(B
+\e$B$r\e(B @samp{multipart/related} \e$B$N7A<0$G5-;v$K$O$a9~$_$^$9!#JQ\e(B
+\e$B?t\e(B @code{nnshimbun-encapsulate-images} \e$B$N%G%#%U%)%k%HCM$O!"\e(B
+@code{shimbun} \e$B%i%$%V%i%j$NJQ?t\e(B @code{shimbun-encapsulate-images} \e$B$NCM$G\e(B
+\e$B$9\e(B (\e$B$?$V$s$=$N%G%#%U%)%k%HCM$O\e(B @code{t} \e$B$G$9\e(B)\e$B!#\e(B
 
 @item index-range
 @vindex nnshimbun-index-range
@@ -12755,8 +12758,8 @@ an_egroup RET egroups RET www.egroups.comRET your@@email.address RET}\e$B!#\e(B
 \e$B$N3FMWAG$O<!$N$h$&$JCM$r;}$A$^$9!#=i4|CM$O\e(B @code{nil} \e$B$G$9!#\e(B
 
 @lisp
-'("^nnshimbun\\+asahi:"
-  index-range all prefetch-articles t expiry-wait 6)
+'("^nnshimbun\\+asahi:" index-range all prefetch-articles off
+  encapsulate-images on expiry-wait 6)
 @end lisp
 
 \e$B;w$?@-3J$r;}$DJ#?t$N%0%k!<%W$KBP$7$FF1$8@_Dj$r9T$J$&$3$H$,$G$-$k$N$G!"8D!9\e(B