Merge from emacs-23

[bpt/emacs.git] / lisp / gnus / gnus-score.el

diff --git a/lisp/gnus/gnus-score.el b/lisp/gnus/gnus-score.el
index 1390db3..26c0122 100644 (file)
--- a/lisp/gnus/gnus-score.el
+++ b/lisp/gnus/gnus-score.el
@@ -1,7 +1,7 @@
 ;;; gnus-score.el --- scoring code for Gnus
 
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-;;   2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
 ;; Author: Per Abrahamsen <amanda@iesd.auc.dk>
 ;;     Lars Magne Ingebrigtsen <larsi@gnus.org>
@@ -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: