* nnshimbun.el (nnshimbun-find-parameter): Undo the last bogus changes.

diff --git a/ChangeLog b/ChangeLog
index 47f7707..48c0b32 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2001-06-18  Katsumi Yamaoka <yamaoka@jpl.org>
 
+       * lisp/nnshimbun.el (nnshimbun-find-parameter): Undo the last
+       bogus changes; use the value of `nnshimbun-pre-fetch-article' if
+       the value of the group parameter `prefetch-articles' is nil; do
+       likewise for `encapsulate-images'.
+
+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'.

diff --git a/lisp/nnshimbun.el b/lisp/nnshimbun.el
index 28a75c8..a949be4 100644 (file)
--- a/lisp/nnshimbun.el
+++ b/lisp/nnshimbun.el
@@ -236,20 +236,18 @@ GROUP has a full name."
                           'index-range)
                nnshimbun-index-range))
          ((eq 'prefetch-articles (eval symbol))
-          `(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)
+          `(let ((val (or (plist-get (nnshimbun-find-group-parameters ,name)
+                                     'prefetch-articles)
+                          nnshimbun-pre-fetch-article)))
+             (if (eq 'off val)
+                 nil
                val)))
          ((eq 'encapsulate-images (eval symbol))
-          `(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)
+          `(let ((val (or (plist-get (nnshimbun-find-group-parameters ,name)
+                                     'encapsulate-images)
+                          nnshimbun-encapsulate-images)))
+             (if (eq 'off val)
+                 nil
                val)))
          ((eq 'expiry-wait (eval symbol))
           (if full-name-p

diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi
index 98cd971..603461a 100644 (file)
--- a/texi/gnus-ja.texi
+++ b/texi/gnus-ja.texi
@@ -12697,27 +12697,25 @@ an_egroup RET egroups RET www.egroups.comRET your@@email.address RET}\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$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$B1\Mw;~$KBT$?$5$l$k$3$H$O>/$J$/$J$j$^$9!#%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{nil} \e$B$K\e(B
+\e$B$J$C$F$$$k%0%k!<%W$G$O!"%0%k!<%W%Q%i%a!<%?\e(B @code{prefetch-articles} \e$B$NBe\e(B
+\e$B$o$j$K%G%#%U%)%k%HCM$H$7$FJQ?t\e(B @code{nnshimbun-pre-fetch-article} \e$B$NCM$,\e(B
+\e$B;H$o$l$^$9!#$3$NJQ?t\e(B @code{nnshimbun-pre-fetch-article} \e$B$N=i4|CM\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{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%G!<%?$r\e(B @samp{multipart/related} \e$B$N7A<0$G5-;v$K$O$a9~$_$^$9!#%0%k!<%W%Q\e(B
+\e$B%i%a!<%?\e(B @code{encapsulate-images} \e$B$,@_Dj$5$l$F$$$J$$$+!"$=$NCM$,\e(B
+@code{nil} \e$B$K$J$C$F$$$k%0%k!<%W$G$O!"%0%k!<%W%Q%i%a!<\e(B
+\e$B%?\e(B @code{encapsulate-images} \e$B$NBe$o$j$K%G%#%U%)%k%HCM$H$7$FJQ\e(B
+\e$B?t\e(B @code{nnshimbun-encapsulate-images} \e$B$NCM$,;H$o$l$^$9!#$3$NJQ\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
+\e$B$9\e(B (\e$B$?$V$s$=$N=i4|CM$O\e(B @code{t} \e$B$G$9\e(B)\e$B!#\e(B
 
 @item index-range
 @vindex nnshimbun-index-range