(gnus-score-find-trace): Handle default score in total score calculation

correctly.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4487e00..6117c63 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2008-11-24  Reiner Steib  <Reiner.Steib@gmx.de>
+
+       * gnus-score.el (gnus-score-find-trace): Handle default score in total
+       score calculation correctly.
+
 2008-11-11  Teodor Zlatanov  <tzz@lifelogs.com>
 
        * nnrss.el (nnrss-make-hash-index): Debug message of full item.
@@ -1696,7 +1701,7 @@
        * gnus-uu.el (gnus-uu-yenc-article): Use insert-buffer-substring.
 
        * gnus-art.el, gnus-spec.el, gnus-sum.el, gnus-util.el:
-       * message.el, mm-view.el, sieve-manage, smime.el:
+       * message.el, mm-view.el, sieve-manage.el, smime.el:
        Add declare-function compatibility definition.
 
        * gnus-art.el (w3-region, w3m-region, Info-menu):
@@ -2075,10 +2080,6 @@
        message-send-mail-function.  Adjust doc string.
        (message-send-mail-with-mailclient): New function.
 
-2007-11-17  Richard Stallman  <rms@gnu.org>
-
-       * assistant.el: Remove file.
-
 2007-11-16  Dan Nicolaescu  <dann@ics.uci.edu>
 
        * smime.el (from):

diff --git a/lisp/gnus-score.el b/lisp/gnus-score.el
index 1390db3..7f936ba 100644 (file)
--- a/lisp/gnus-score.el
+++ b/lisp/gnus-score.el
@@ -2469,7 +2469,11 @@ score in `gnus-newsgroup-scored' by SCORE."
                   (abbreviate-file-name file))))
        (insert
         (format "\nTotal score: %d"
-                (apply '+ (mapcar 'caddr trace))))
+                (apply '+ (mapcar
+                           (lambda (s)
+                             (or (caddr s)
+                                 gnus-score-interactive-default-score))
+                           trace))))
        (insert
         "\n\nQuick help: