Synch with Oort Gnus.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fbb2590..66c5f20 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2003-01-07  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * gnus-score.el (gnus-score-followup): Also score immediate
+       followups. 
+
+2003-01-06  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * nnweb.el (nnweb-asynchronous-p): Changed to nil.
+
 2003-01-07  Simon Josefsson  <jas@extundo.com>
 
        * message.el (message-mode-menu): Fix receipt balloon help.

diff --git a/lisp/gnus-score.el b/lisp/gnus-score.el
index 0002f80..f3582ac 100644 (file)
--- a/lisp/gnus-score.el
+++ b/lisp/gnus-score.el
@@ -1758,7 +1758,8 @@ score in `gnus-newsgroup-scored' by SCORE."
                        (setq found t)
                        (when trace
                          (push
-                          (cons (car-safe (rassq alist gnus-score-cache)) kill)
+                          (cons (car-safe (rassq alist gnus-score-cache))
+                                kill)
                           gnus-score-trace)))
                      ;; Update expire date
                      (unless trace
@@ -1864,6 +1865,7 @@ score in `gnus-newsgroup-scored' by SCORE."
                (setq found (setq arts (get-text-property (point) 'articles)))
                ;; Found a match, update scores.
                (while (setq art (pop arts))
+                 (setcdr art (+ score (cdr art)))
                  (when (setq new (gnus-score-add-followups
                                   (car art) score all-scores thread))
                    (push new news)))))

diff --git a/lisp/nnweb.el b/lisp/nnweb.el
index c4bc8c5..7937da5 100644 (file)
--- a/lisp/nnweb.el
+++ b/lisp/nnweb.el
@@ -204,7 +204,7 @@ Valid types include `google', `dejanews', and `gmane'.")
   (nnweb-possibly-change-server group server))
 
 (deffoo nnweb-asynchronous-p ()
-  t)
+  nil)
 
 (deffoo nnweb-request-create-group (group &optional server args)
   (nnweb-possibly-change-server nil server)