Synch to Gnus 200305161606.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7ee7e90..295cfb0 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2003-05-16  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * gnus-sum.el (gnus-summary-move-article): Don't copy expirable
+       marks if the destination group is not auto-expirable.
+
 2003-05-14  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * dgnushack.el (assq-delete-all): Removed the compiler macro.

diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index 9619691..d6d299b 100644 (file)
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -8916,9 +8916,6 @@ ACTION can be either `move' (the default), `crosspost' or `copy'."
                 (crosspost "Crosspost" "Crossposting")))
        (copy-buf (save-excursion
                    (nnheader-set-temp-buffer " *copy article*")))
-       (default-marks gnus-article-mark-lists)
-       (no-expire-marks (delete '(expirable . expire)
-                                (copy-sequence gnus-article-mark-lists)))
        art-group to-method new-xref article to-groups)
     (unless (assq action names)
       (error "Unknown action %s" action))
@@ -9049,8 +9046,9 @@ ACTION can be either `move' (the default), `crosspost' or `copy'."
 
            ;; See whether the article is to be put in the cache.
            (let ((marks (if (gnus-group-auto-expirable-p to-group)
-                            default-marks
-                          no-expire-marks))
+                            gnus-article-mark-lists
+                          (delete '(expirable . expire)
+                                  (copy-sequence gnus-article-mark-lists))))
                  (to-article (cdr art-group)))
 
              ;; Enter the article into the cache in the new group,

diff --git a/texi/gnus.texi b/texi/gnus.texi
index e7eabb3..817618b 100644 (file)
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -18006,8 +18006,8 @@ the download status of each article so that you always know which
 articles will be available when unplugged.
 
 The first visual effect is the @samp{%O} spec.  If you customize
-gnus-summary-line-format to include this specifier, you will add a
-single character field that indicates an article's download status.
+@code{gnus-summary-line-format} to include this specifier, you will add
+a single character field that indicates an article's download status.
 Articles that have been fetched into either the Agent or the Cache,
 will display @code{gnus-downloaded-mark} (defaults to @samp{+}).  All
 other articles will display @code{gnus-undownloaded-mark} (defaults to
@@ -18037,8 +18037,8 @@ faces will be obscured by the undownloaded faces.  If this is your
 situation, you have two choices available.  First, you can completely
 disable the undownload faces by customizing
 @code{gnus-summary-highlight} to delete the three cons-cells that
-refer to the gnus-summary*-undownloaded-face faces.  Second, if you
-prefer to take a more fine-grained approach, you may set the
+refer to the @code{gnus-summary-*-undownloaded-face} faces.  Second, if
+you prefer to take a more fine-grained approach, you may set the
 @code{agent-disable-undownloaded-faces} group parameter to t.  This
 parameter, like all other agent parameters, may be set on an Agent
 Category (@pxref{Agent Categories}), a Group Topic (@pxref{Topic