Re: HEADS UP: Largely rewritten gnus-agent implementation.

[Kevin Greiner <kgreiner@xpediantsolutions.com>]

[-- Attachment #1.1: Type: text/plain, Size: 1839 bytes --]

Mark,
Thanks for the feedback.

Kai- You're right that gnus-remove-from-range is effectively the 
gnus-range-difference that I wrote.  I have found one critical 
difference; gnus-range-difference creates a new range rather than 
editing the original range1.  The gnus-summary-insert-old-articles 
function passes gnus-newsgroup-active so there is a chance that 
gnus-remove-from-range might corrupt the active range.  Calling 
gnus-remove-from-range would have otherwise worked except that I 
introduced a new bug with the rest of my changes.  I've attached a patch 
for gnus-sum.el (version 6.241) below that will get 
gnus-summary-insert-old-articles working with gnus-range-difference. 
 I've also attached a patch for adding gnus-range-difference to 
gnus-range.el (version 6.12).

Kevin

Kai Großjohann wrote:

>Mark Triggs <mst@dishevelled.net> writes:
>
>  
>
>>After applying the patch, I seem to get the following:
>>
>>  Debugger entered--Lisp error: (wrong-type-argument number-or-marker-p (4882 . 5694))
>>    gnus-sorted-difference(((4882 . 5694) (5698 . 5700)) (5695 5696 5697))
>>    gnus-summary-insert-articles(((4882 . 5694) (5698 . 5700)))
>>    gnus-summary-insert-old-articles(nil)
>>    call-interactively(gnus-summary-insert-old-articles)
>>    
>>
>
>Could you apply the following patch on top of the previous one?
>I even tested it once :-)
>
>--- gnus-sum.el	2002/11/21 07:43:41	6.238.1.1
>+++ gnus-sum.el	2002/11/25 07:26:57
>@@ -11178,7 +11178,8 @@
> ;;;	      (gnus-sorted-difference
> ;;;	       (gnus-uncompress-range (list gnus-newsgroup-active))
> ;;;	       old)
>-              (gnus-range-difference (list gnus-newsgroup-active) old)
>+	      (gnus-uncompress-range
>+	       (gnus-remove-from-range (list gnus-newsgroup-active) old))
> )
> 	(setq len (gnus-range-length older))
> 	(cond
>
>kai
>  
>



[-- Attachment #1.2: Type: text/html, Size: 2270 bytes --]

[-- Attachment #2: patch-range.txt --]
[-- Type: text/plain, Size: 1705 bytes --]

diff -r6.12 gnus-range.el
63a64,104
> (defun gnus-range-difference (range1 range2)
>   "Return the range of elements in RANGE1 that do not appear in RANGE2.
> Both ranges must be in ascending order."
>   (setq range1 (gnus-range-normalize range1))
>   (setq range2 (gnus-range-normalize range2))
>   (let* ((new-range (cons nil (copy-sequence range1)))
>          (r new-range)
>          (safe t))
>     (while (cdr r)
>       (let* ((r1 (cadr r))
>              (r2 (car range2))
>              (min1 (if (numberp r1) r1 (car r1)))
>              (max1 (if (numberp r1) r1 (cdr r1)))
>              (min2 (if (numberp r2) r2 (car r2)))
>              (max2 (if (numberp r2) r2 (cdr r2))))
> 
>         (cond ((> min1 max1)
>                ;; Invalid range: may result from overlap condition (below)
>                ;; remove Invalid range
>                (setcdr r (cddr r)))
>               ((and (= min1 max1)
>                     (listp r1))
>                ;; Inefficient representation: may result from overlap condition (below)
>                (setcar (cdr r) min1))
>               ((not min2)
>                ;; All done with range2
>                (setq r nil))
>               ((< max1 min2)
>                ;; No overlap: range1 preceeds range2
>                (pop r))
>               ((< max2 min1)
>                ;; No overlap: range2 preceeds range1
>                (pop range2))
>               ((and (<= min2 min1) (<= max1 max2))
>                ;; Complete overlap: range1 removed
>                (setcdr r (cddr r)))
>               (t
>                (setcdr r (nconc (list (cons min1 (1- min2)) (cons (1+ max2) max1)) (cddr r)))))))
>     (cdr new-range))
>   )
> 

[-- Attachment #3: patch-sum.txt --]
[-- Type: text/plain, Size: 403 bytes --]

RCS file: /usr/local/cvsroot/gnus/lisp/gnus-sum.el,v
retrieving revision 6.241
diff -r6.241 gnus-sum.el
11181,11182c11181
< 	      (gnus-uncompress-range
< 	       (gnus-remove-from-range (list gnus-newsgroup-active) old))
---
>               (gnus-range-difference (list gnus-newsgroup-active) old)
11202c11201,11202
< 	 (all nil)
---
> 	 (all 
>           (setq older (gnus-uncompress-range older)))