Synch with Oort Gnus.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6ffbeb4..04ee738 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,14 +1,17 @@
 2002-12-11  Katsumi Yamaoka  <yamaoka@jpl.org>
 
-       * gnus-sum.el (gnus-summary-highlight): Protect against non-
-       existent of the variable `downloaded'.
+       * gnus-sum.el (gnus-tmp-downloaded): New internal variable.
+       (gnus-summary-highlight): Use it instead of `downloaded'.
+       (gnus-summary-highlight-line): Ditto.
+
+       * gnus-agent.el (gnus-agent-regenerate-group): Ditto.
 
 2002-12-11  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * gnus.el (gnus-variable-list): Add gnus-agent-covered-methods.
 
        * gnus-agent.el (gnus-agent-check-overview-buffer): Remove debug
-       calls. 
+       calls.
 
        * gnus-sum.el (gnus-summary-highlight-line): Don't set the
        downloaded variable if we're in an uncovered group.

diff --git a/lisp/gnus-agent.el b/lisp/gnus-agent.el
index fd7d086..f37cb63 100644 (file)
--- a/lisp/gnus-agent.el
+++ b/lisp/gnus-agent.el
@@ -2266,12 +2266,13 @@ FORCE is equivalent to setting gnus-agent-expire-days to zero(0)."
                                   (gnus-find-method-for-group group)))
          (file (gnus-agent-article-name ".overview" group))
          (dir (file-name-directory file))
-         point 
-         (downloaded (if (file-exists-p dir)
-                         (sort (mapcar (lambda (name) (string-to-int name))
-                                       (directory-files dir nil "^[0-9]+$" t))
-                               '>)
-                       (progn (gnus-make-directory dir) nil)))
+         point
+        (gnus-tmp-downloaded
+         (if (file-exists-p dir)
+             (sort (mapcar (lambda (name) (string-to-int name))
+                           (directory-files dir nil "^[0-9]+$" t))
+                   '>)
+           (progn (gnus-make-directory dir) nil)))
          dl nov-arts
          alist header
          regenerated)

diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index 380145f..8109a83 100644 (file)
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -872,6 +872,8 @@ automatically when it is selected."
   :group 'gnus-summary-visual
   :type 'face)
 
+(defvar gnus-tmp-downloaded nil)
+
 (defcustom gnus-summary-highlight
   '(((eq mark gnus-canceled-mark)
      . gnus-summary-cancelled-face)
@@ -892,7 +894,7 @@ automatically when it is selected."
      . gnus-summary-low-ancient-face)
     ((eq mark gnus-ancient-mark)
      . gnus-summary-normal-ancient-face)
-    ((and (boundp 'downloaded) downloaded)
+    (gnus-tmp-downloaded
      . gnus-agent-downloaded-article-face)
     ((and (> score default-high) (eq mark gnus-unread-mark))
      . gnus-summary-high-unread-face)
@@ -10994,7 +10996,7 @@ If REVERSE, save parts that do not match TYPE."
        (default gnus-summary-default-score)
        (default-high gnus-summary-default-high-score)
        (default-low gnus-summary-default-low-score)
-       (downloaded
+       (gnus-tmp-downloaded
        (and
         (boundp 'gnus-agent-article-alist)
         gnus-agent-article-alist