[Emacs-diffs] /srv/bzr/emacs/trunk r103667: gnus-sum.el (gnus-articles-to-read): Revert back to old behaviour if we're selecting a group with unread articles.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 103667
author: Lars Magne Ingebrigtsen <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Tue 2011-03-15 22:57:48 +0000
message:
  gnus-sum.el (gnus-articles-to-read): Revert back to old behaviour if we're 
selecting a group with unread articles.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/gnus-sum.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2011-03-15 22:38:41 +0000
+++ b/lisp/gnus/ChangeLog       2011-03-15 22:57:48 +0000
@@ -1,5 +1,8 @@
 2011-03-15  Lars Magne Ingebrigtsen  <address@hidden>
 
+       * 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

=== modified file 'lisp/gnus/gnus-sum.el'
--- a/lisp/gnus/gnus-sum.el     2011-03-15 22:43:25 +0000
+++ b/lisp/gnus/gnus-sum.el     2011-03-15 22:57:48 +0000
@@ -5798,7 +5798,8 @@
 
 (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 @@
                 (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 @@
                  (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
-                          (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))
-                          nil
-                          nil
-                          (number-to-string
-                           (or initial gnus-large-newsgroup)))))
+                          (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 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 default))))
                    (if (string-match "^[ \t]*$" input) number input)))
                 ((and (> scored marked) (< scored number)
                       (> (- scored number) 20))