[gnus git] branch master updated: n0-13-120-g9347185 =1= (gnus-articles-to-read): Revert back to old behaviour if we're selecting a group with unread articles.

       via  93471850666fac0d07a2dbd4d3d3552be7047bd4 (commit)
      from  fa33e8758a516a81d56d590f1a7328f61b79d8e7 (commit)


- Log -----------------------------------------------------------------
commit 93471850666fac0d07a2dbd4d3d3552be7047bd4
Author: Lars Magne Ingebrigtsen <[email protected]>
Date:   Tue Mar 15 23:51:16 2011 +0100

    (gnus-articles-to-read): Revert back to old behaviour if we're selecting a group with unread articles.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3a2a422..56c4bde 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2011-03-15  Lars Magne Ingebrigtsen  <[email protected]>
 
+	* gnus-sum.el (gnus-articles-to-read): Revert back to old behaviour if
+	we're selecting a group with unread articles.
+
 	* nnimap.el (nnimap-open-connection-1): Allow `network-only', too.
 
 	* gssapi.el: New file separated out from imap.el to provide a general
diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index 0fa1d59..3854603 100644
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -5798,7 +5798,8 @@ If SELECT-ARTICLES, only select those articles from GROUP."
 
 (defun gnus-articles-to-read (group &optional read-all)
   "Find out what articles the user wants to read."
-  (let* ((articles
+  (let* ((only-read-p t)
+	 (articles
 	  ;; Select all articles if `read-all' is non-nil, or if there
 	  ;; are no unread articles.
 	  (if (or read-all
@@ -5822,6 +5823,7 @@ If SELECT-ARTICLES, only select those articles from GROUP."
 		 (gnus-uncompress-range (gnus-active group)))
 	       (gnus-cache-articles-in-group group))
 	    ;; Select only the "normal" subset of articles.
+	    (setq only-read-p nil)
 	    (gnus-sorted-nunion
 	     (gnus-sorted-union gnus-newsgroup-dormant gnus-newsgroup-marked)
 	     gnus-newsgroup-unreads)))
@@ -5845,18 +5847,25 @@ If SELECT-ARTICLES, only select those articles from GROUP."
 		  (let* ((cursor-in-echo-area nil)
 			 (initial (gnus-parameter-large-newsgroup-initial
 				   gnus-newsgroup-name))
+			 (default (if only-read-p
+				      (or initial gnus-large-newsgroup)
+				    number))
 			 (input
 			  (read-string
+			   (if only-read-p
 			   (format
 			    "How many articles from %s (available %d, default %d): "
 			    (gnus-group-decoded-name
 			     (gnus-group-real-name gnus-newsgroup-name))
-			    number
-			    (or initial gnus-large-newsgroup))
+			      number default)
+			     (format
+				"How many articles from %s (%d available): "
+				(gnus-group-decoded-name
+				 (gnus-group-real-name gnus-newsgroup-name))
+				default))
 			   nil
 			   nil
-			   (number-to-string
-			    (or initial gnus-large-newsgroup)))))
+			   (number-to-string default))))
 		    (if (string-match "^[ \t]*$" input) number input)))
 		 ((and (> scored marked) (< scored number)
 		       (> (- scored number) 20))

-----------------------------------------------------------------------
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we listed those
revisions in full, above.

Summary of changes:
 lisp/ChangeLog   |    3 +++
 lisp/gnus-sum.el |   27 ++++++++++++++++++---------
 2 files changed, 21 insertions(+), 9 deletions(-)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnus Project".

The branch, master has been updated


hooks/post-receive
-- 
Gnus Project