X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fgnus-range.el;h=5e0dc1382a42416dc97dac6d2b4ea0fba298c95b;hb=7be3d2f29cf04a714797434aa3f4beaea9761800;hp=97197fed4b89c422411f01a37d6df96ec2b6cb79;hpb=7ebf974f6bac5c2f61e7c7cda2962fa4d8766b81;p=elisp%2Fgnus.git-

diff --git a/lisp/gnus-range.el b/lisp/gnus-range.el
index 97197fe..5e0dc13 100644
--- a/lisp/gnus-range.el
+++ b/lisp/gnus-range.el
@@ -225,18 +225,19 @@ Note: LIST has to be sorted over `<'."
       out)))
 
 (defun gnus-remove-from-range (range1 range2)
-  "Return a range that has all articles from RANGE2 removed from
-RANGE1. The returned range is always a list. RANGE2 can also be a
-unsorted list of articles."
-  (if (listp (cdr range2))
-      (setq range2 (sort range2 (lambda (e1 e2)
-                                 (< (if (consp e1) (car e1) e1)
-                                    (if (consp e2) (car e2) e2))))))
+  "Return a range that has all articles from RANGE2 removed from RANGE1.
+The returned range is always a list.  RANGE2 can also be a unsorted
+list of articles.  RANGE1 is modified by side effects, RANGE2 is not
+modified."
   (if (or (null range1) (null range2))
       range1
-    (let (out r1 r2 r1_min r1_max r2_min r2_max)
+    (let (out r1 r2 r1_min r1_max r2_min r2_max
+	      (range2 (gnus-copy-sequence range2)))
       (setq range1 (if (listp (cdr range1)) range1 (list range1))
-	    range2 (if (listp (cdr range2)) range2 (list range2))
+	    range2 (sort (if (listp (cdr range2)) range2 (list range2))
+			 (lambda (e1 e2)
+			   (< (if (consp e1) (car e1) e1)
+			      (if (consp e2) (car e2) e2))))
 	    r1 (car range1)
 	    r2 (car range2)
 	    r1_min (if (consp r1) (car r1) r1)
@@ -244,7 +245,7 @@ unsorted list of articles."
 	    r2_min (if (consp r2) (car r2) r2)
 	    r2_max (if (consp r2) (cdr r2) r2))
       (while (and range1 range2)
-	(cond ((< r2_max r1_min)                           ; r2 < r1
+	(cond ((< r2_max r1_min)	; r2 < r1
 	       (pop range2)
 	       (setq r2 (car range2)
 		     r2_min (if (consp r2) (car r2) r2)
@@ -265,7 +266,7 @@ unsorted list of articles."
 		   (push r1_min out)
 		 (push (cons r1_min (1- r2_min)) out))
 	       (pop range2)
-	       (if (< r2_max r1_max) ; finished with r1?
+	       (if (< r2_max r1_max)	; finished with r1?
 		   (setq r1_min (1+ r2_max))
 		 (pop range1)
 		 (setq r1 (car range1)
@@ -282,7 +283,7 @@ unsorted list of articles."
 	       (setq r1 (car range1)
 		     r1_min (if (consp r1) (car r1) r1)
 		     r1_max (if (consp r1) (cdr r1) r1)))
-	      ((< r1_max r2_min)                           ; r2 > r1
+	      ((< r1_max r2_min)	; r2 > r1
 	       (pop range1)
 	       (if (eq r1_min r1_max)
 		   (push r1_min out)
@@ -296,7 +297,7 @@ unsorted list of articles."
 	  (push (cons r1_min r1_max) out))
 	(pop range1))
       (while range1
-        (push (pop range1) out))
+	(push (pop range1) out))
       (nreverse out))))
 
 (defun gnus-member-of-range (number ranges)