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

diff --git a/ChangeLog b/ChangeLog
index 74c0cc5..97637a5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,8 @@
 2001-06-18  Katsumi Yamaoka <yamaoka@jpl.org>
 
-       * lisp/nnshimbun.el (nnshimbun-find-parameter): Treat the value
-       nil as `off' for the group parameters `prefetch-articles',
-       `encapsulate-images' and the related variables.
+       * lisp/nnshimbun.el (nnshimbun-encapsulate-images): Fix a
+       doc-string that both the values `off' and nil specifies not to
+       encapsulate images.
        (nnshimbun-encapsulate-images): Fix a doc-string that both the
        values `off' and nil specifies not to encapsulate images.
        (nnshimbun-pre-fetch-article): Default to `off'.

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