Merge Changes made in Gnus master

2013-07-30 Lars Magne Ingebrigtsen <larsi@gnus.org>
  * gnus-start.el (gnus-read-active-for-groups): Always mark the data as
  dirty to ensure nnimap data being saved.

2013-07-30 Tassilo Horn <tsdh@gnu.org>
  * gnus-sum.el (gnus-summary-make-menu-bar): Add "Current thread score"
  menu entry.
  * gnus-score.el (gnus-summary-current-score): Use prefix arg to show
  the current thread's total score instead of the current article's
  score.

4 files changed, 26 insertions, 5 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 4230d010a5d..226d97fdf37 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,5 +1,17 @@
+2013-07-30  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * gnus-start.el (gnus-read-active-for-groups): Always mark the data as
+        dirty to ensure nnimap data being saved.
+
 2013-07-30  Tassilo Horn  <tsdh@gnu.org>
 
+        * gnus-sum.el (gnus-summary-make-menu-bar): Add "Current thread score"
+        menu entry.
+
+        * gnus-score.el (gnus-summary-current-score): Use prefix arg to show
+        the current thread's total score instead of the current article's
+        score.
+
         * gnus-sum.el (gnus-subthread-sort-functions): New defcustom.
         (gnus-sort-threads-recursively): Delete defcustom.
         (gnus-sort-threads-recursive): Adapt accordingly.
diff --git a/lisp/gnus/gnus-score.el b/lisp/gnus/gnus-score.el
index da5c31325bd..5f91246761e 100644
--- a/lisp/gnus/gnus-score.el
+++ b/lisp/gnus/gnus-score.el
@@ -1071,10 +1071,15 @@ EXTRA is the possible non-standard header."
         (push (cons article n) gnus-newsgroup-scored)))
     (gnus-summary-update-line)))
 
-(defun gnus-summary-current-score ()
-  "Return the score of the current article."
-  (interactive)
-  (gnus-message 1 "%s" (gnus-summary-article-score)))
+(defun gnus-summary-current-score (arg)
+  "Return the score of the current article.
+  With prefix ARG, return the total score of the current (sub)thread."
+  (interactive "P")
+  (gnus-message 1 "%s" (if arg
+                           (gnus-thread-total-score
+                            (gnus-id-to-thread
+                             (mail-header-id (gnus-summary-article-header))))
+                           (gnus-summary-article-score))))
 
 (defun gnus-score-change-score-file (file)
   "Change current score alist."
diff --git a/lisp/gnus/gnus-start.el b/lisp/gnus/gnus-start.el
index 05cf290cac9..e27fb522b86 100644
--- a/lisp/gnus/gnus-start.el
+++ b/lisp/gnus/gnus-start.el
@@ -1807,6 +1807,9 @@ backend check whether the group actually exists."
        (or (not (gnus-agent-method-p method))
            (gnus-online method)))
       (gnus-finish-retrieve-group-infos method infos early-data)
+      ;; We may have altered the data now, so mark the dribble buffer
+      ;; as dirty so that it gets saved.
+      (gnus-dribble-touch)
       (gnus-agent-save-active method))
      ;; Most backends have -retrieve-groups.
      ((gnus-check-backend-function 'retrieve-groups (car method))
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index a7269baee74..94f4e703180 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -2359,7 +2359,8 @@ increase the score of each group you read."
            ["Mark above" gnus-summary-mark-above t]
            ["Tick above" gnus-summary-tick-above t]
            ["Clear above" gnus-summary-clear-above t])
-          ["Current score" gnus-summary-current-score t]
+          ["Current article score" gnus-summary-current-score t]
+          ["Current thread score" (gnus-summary-current-score 'total) t]
           ["Set score" gnus-summary-set-score t]
           ["Switch current score file..." gnus-score-change-score-file t]
           ["Set mark below..." gnus-score-set-mark-below t]