[Emacs-diffs] trunk r113606: Merge Changes made in Gnus master

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 113606
revision-id: address@hidden
parent: address@hidden
author: Gnus developers <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Tue 2013-07-30 22:09:37 +0000
message:
  Merge Changes made in Gnus master
  
  2013-07-30 Lars Magne Ingebrigtsen <address@hidden>
    * 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 <address@hidden>
    * 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.
modified:
  lisp/gnus/ChangeLog            changelog-20091113204419-o5vbwnq5f7feedwu-1433
  lisp/gnus/gnus-score.el        
gnusscore.el-20091113204419-o5vbwnq5f7feedwu-1131
  lisp/gnus/gnus-start.el        
gnusstart.el-20091113204419-o5vbwnq5f7feedwu-1136
  lisp/gnus/gnus-sum.el          gnussum.el-20091113204419-o5vbwnq5f7feedwu-1137

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2013-07-30 08:16:20 +0000
+++ b/lisp/gnus/ChangeLog       2013-07-30 22:09:37 +0000
@@ -1,5 +1,17 @@
+2013-07-30  Lars Magne Ingebrigtsen  <address@hidden>
+
+       * 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  <address@hidden>
 
+       * 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.

=== modified file 'lisp/gnus/gnus-score.el'
--- a/lisp/gnus/gnus-score.el   2013-01-02 16:13:04 +0000
+++ b/lisp/gnus/gnus-score.el   2013-07-30 22:09:37 +0000
@@ -1071,10 +1071,15 @@
        (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."

=== modified file 'lisp/gnus/gnus-start.el'
--- a/lisp/gnus/gnus-start.el   2013-07-19 14:50:21 +0000
+++ b/lisp/gnus/gnus-start.el   2013-07-30 22:09:37 +0000
@@ -1807,6 +1807,9 @@
        (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))

=== modified file 'lisp/gnus/gnus-sum.el'
--- a/lisp/gnus/gnus-sum.el     2013-07-30 08:16:20 +0000
+++ b/lisp/gnus/gnus-sum.el     2013-07-30 22:09:37 +0000
@@ -2359,7 +2359,8 @@
           ["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]