Commit 3eb9b5fd authored by Gnus developers's avatar Gnus developers Committed by Katsumi Yamaoka
Browse files

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.
parent f4b169ce
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.
......
......@@ -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."
......
......@@ -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))
......
......@@ -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]
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment