[Emacs-diffs] Changes to emacs/lisp/gnus/nnvirtual.el

[Miles Bader]

Index: emacs/lisp/gnus/nnvirtual.el
diff -c emacs/lisp/gnus/nnvirtual.el:1.10 emacs/lisp/gnus/nnvirtual.el:1.11
*** emacs/lisp/gnus/nnvirtual.el:1.10   Mon Sep  1 15:45:25 2003
--- emacs/lisp/gnus/nnvirtual.el        Sat Sep  4 13:13:44 2004
***************
*** 1,10 ****
  ;;; nnvirtual.el --- virtual newsgroups access for Gnus
! ;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2002
  ;;        Free Software Foundation, Inc.
  
  ;; Author: David Moore <address@hidden>
  ;;    Lars Magne Ingebrigtsen <address@hidden>
! ;;    Masanobu UMEDA <address@hidden>
  ;; Keywords: news
  
  ;; This file is part of GNU Emacs.
--- 1,10 ----
  ;;; nnvirtual.el --- virtual newsgroups access for Gnus
! ;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
  ;;        Free Software Foundation, Inc.
  
  ;; Author: David Moore <address@hidden>
  ;;    Lars Magne Ingebrigtsen <address@hidden>
! ;;    Masanobu UMEDA <address@hidden>
  ;; Keywords: news
  
  ;; This file is part of GNU Emacs.
***************
*** 45,57 ****
  (nnoo-declare nnvirtual)
  
  (defvoo nnvirtual-always-rescan t
!   "*If non-nil, always scan groups for unread articles when entering a group.
  If this variable is nil and you read articles in a component group
  after the virtual group has been activated, the read articles from the
  component group will show up when you enter the virtual group.")
  
  (defvoo nnvirtual-component-regexp nil
!   "*Regexp to match component groups.")
  
  (defvoo nnvirtual-component-groups nil
    "Component group in this nnvirtual group.")
--- 45,57 ----
  (nnoo-declare nnvirtual)
  
  (defvoo nnvirtual-always-rescan t
!   "If non-nil, always scan groups for unread articles when entering a group.
  If this variable is nil and you read articles in a component group
  after the virtual group has been activated, the read articles from the
  component group will show up when you enter the virtual group.")
  
  (defvoo nnvirtual-component-regexp nil
!   "Regexp to match component groups.")
  
  (defvoo nnvirtual-component-groups nil
    "Component group in this nnvirtual group.")
***************
*** 374,381 ****
                              #'(lambda (article)
                                  (nnvirtual-reverse-map-article
                                   group article))
!                             (gnus-group-expire-articles-1 group)))))
!     (sort unexpired '<)))
  
  
  ;;; Internal functions.
--- 374,382 ----
                              #'(lambda (article)
                                  (nnvirtual-reverse-map-article
                                   group article))
!                             (gnus-uncompress-range
!                              (gnus-group-expire-articles-1 group))))))
!     (sort (delq nil unexpired) '<)))
  
  
  ;;; Internal functions.
***************
*** 425,431 ****
           (concat (regexp-quote (gnus-group-real-name group)) ":[0-9]+")
           nil t)
        (replace-match "" t t))
!     (unless (= (point) (point-max))
        (insert " ")
        (when (not (string= "" prefix))
        (while (re-search-forward "[^ ]+:[0-9]+" nil t)
--- 426,432 ----
           (concat (regexp-quote (gnus-group-real-name group)) ":[0-9]+")
           nil t)
        (replace-match "" t t))
!     (unless (eobp)
        (insert " ")
        (when (not (string= "" prefix))
        (while (re-search-forward "[^ ]+:[0-9]+" nil t)
***************
*** 520,533 ****
  
  
  ;;; We map between virtual articles and real articles in a manner
! ;;; which keeps the size of the virtual active list the same as
! ;;; the sum of the component active lists.
! ;;; To achieve fair mixing of the groups, the last article in
! ;;; each of N component groups will be in the last N articles
! ;;; in the virtual group.
  
! ;;; If you have 3 components A, B and C, with articles 1-8, 1-5, and 6-7
! ;;; respectively, then the virtual article numbers look like:
  ;;;
  ;;;  1  2  3  4  5  6  7  8  9  10 11 12 13 14 15
  ;;;  A1 A2 A3 A4 B1 A5 B2 A6 B3 A7 B4 C6 A8 B5 C7
--- 521,535 ----
  
  
  ;;; We map between virtual articles and real articles in a manner
! ;;; which keeps the size of the virtual active list the same as the
! ;;; sum of the component active lists.
  
! ;;; To achieve fair mixing of the groups, the last article in each of
! ;;; N component groups will be in the last N articles in the virtual
! ;;; group.
! 
! ;;; If you have 3 components A, B and C, with articles 1-8, 1-5, and
! ;;; 6-7 respectively, then the virtual article numbers look like:
  ;;;
  ;;;  1  2  3  4  5  6  7  8  9  10 11 12 13 14 15
  ;;;  A1 A2 A3 A4 B1 A5 B2 A6 B3 A7 B4 C6 A8 B5 C7