Synch with Oort Gnus.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ea41af0..de95849 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,17 @@
+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. 
+
+       * gnus-sum.el (gnus-summary-highlight-line): Don't set the
+       downloaded variable if we're in an uncovered group.
+
+       * gnus-agent.el (gnus-agent-downloaded-article-face): Change the
+       font to soemthing less noticeable.
+       (gnus-agent-group-covered-p): New function.
+
 2002-12-09  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * gnus-agent.el (gnus-agent-braid-nov): Remove corrupted lines.

diff --git a/lisp/gnus-agent.el b/lisp/gnus-agent.el
index 22773e3..fd7d086 100644 (file)
--- a/lisp/gnus-agent.el
+++ b/lisp/gnus-agent.el
@@ -45,9 +45,12 @@
   (autoload 'number-at-point "thingatpt"))
 
 (defface gnus-agent-downloaded-article-face
-  '((((class color) (background light)) (:foreground "Orange" :bold t))
-    (((class color) (background dark)) (:foreground "Yellow" :bold t))
-    (t (:inverse-video t :bold t)))
+  '((((class color)
+      (background light))
+     (:foreground "darkslategray" :bold nil))
+    (((class color) (background dark))
+     (:foreground "LightGray" :bold nil))
+    (t (:inverse-video t :bold nil)))
   "Face used for displaying downloaded articles"
   :group 'gnus-agent)
 
@@ -1104,14 +1107,12 @@ and that there are no duplicates."
             (while (and (zerop (forward-line 1))
                         (not (eobp)))
               (let ((cur (number-at-point)))
-                (cond ((= cur prev-num)
-                       (gnus-message 10
-                                     "Duplicate overview line for %d" cur)
-                       (debug nil (format "Duplicate overview line for %d" cur))
-                       (delete-region (point) (progn (forward-line 1) (point))))
-                      ((< cur prev-num)
-                       (gnus-message 10 "Overview buffer not sorted!")
-                       (debug nil "Overview buffer not sorted!"))))
+                (cond
+                ((= cur prev-num)
+                 (gnus-message 10 "Duplicate overview line for %d" cur)
+                 (delete-region (point) (progn (forward-line 1) (point))))
+                ((< cur prev-num)
+                 (gnus-message 10 "Overview buffer not sorted!"))))
               (setq prev-num (number-at-point)))))))))
 
 
@@ -2487,6 +2488,10 @@ If CLEAN, don't read existing active files."
             (if (eq status 'offline) 'offline 'online)
             (if (eq status 'offline) 'online 'offline))))
 
+(defun gnus-agent-group-covered-p (group)
+  (member (gnus-group-method group)
+         gnus-agent-covered-methods))
+
 (provide 'gnus-agent)
 
 ;;; gnus-agent.el ends here

diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index 1427124..e71003d 100644 (file)
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -10998,6 +10998,7 @@ If REVERSE, save parts that do not match TYPE."
        (and
         (boundp 'gnus-agent-article-alist)
         gnus-agent-article-alist
+        (gnus-agent-group-covered-p gnus-newsgroup-name)
         ;; Optimized for when gnus-summary-highlight-line is
         ;; called multiple times for articles in ascending
         ;; order (i.e. initial generation of summary buffer).
@@ -11016,7 +11017,8 @@ If REVERSE, save parts that do not match TYPE."
                            article)
                         (setq n (cdr gnus-summary-highlight-line-downloaded-cached)))
               (setq gnus-summary-highlight-line-downloaded-cached n)))
-          (and (eq (caar gnus-summary-highlight-line-downloaded-cached) article)
+          (and (eq (caar gnus-summary-highlight-line-downloaded-cached)
+                   article)
                (cdar gnus-summary-highlight-line-downloaded-cached))))))
     (let ((face (funcall (gnus-summary-highlight-line-0))))
       (unless (eq face (get-text-property beg 'face))

diff --git a/lisp/gnus.el b/lisp/gnus.el
index 141493a..e0413d4 100644 (file)
--- a/lisp/gnus.el
+++ b/lisp/gnus.el
@@ -2049,7 +2049,8 @@ This variable can be nil, gnus or gnus-ja."
                        gnus-newsrc-last-checked-date
                        gnus-newsrc-alist gnus-server-alist
                        gnus-killed-list gnus-zombie-list
-                       gnus-topic-topology gnus-topic-alist)
+                       gnus-topic-topology gnus-topic-alist
+                       gnus-agent-covered-methods)
   "Gnus variables saved in the quick startup file.")
 
 (defvar gnus-product-variable-file-list