X-Git-Url: https://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Fgnus-move.el;h=801f891b8a0bd85b4ec645f65596fcb1c3662f4e;hb=4b34fded7033b14cbfcf3dc0db672c72acde7acb;hp=8be17e76ae9bc38095bc7ab7075ce6b54a7357a2;hpb=27e50870dcbd1442e8fe2d14ddfb89cd7c706495;p=gnus

diff --git a/lisp/gnus-move.el b/lisp/gnus-move.el
index 8be17e76a..801f891b8 100644
--- a/lisp/gnus-move.el
+++ b/lisp/gnus-move.el
@@ -1,5 +1,5 @@
 ;;; gnus-move.el --- commands for moving Gnus from one server to another
-;; Copyright (C) 1996 Free Software Foundation, Inc.
+;; Copyright (C) 1996,97 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@ifi.uio.no>
 ;; Keywords: news
@@ -25,6 +25,8 @@
 
 ;;; Code:
 
+(eval-when-compile (require 'cl))
+
 (require 'gnus)
 (require 'gnus-start)
 (require 'gnus-int)
@@ -40,7 +42,7 @@
 Update the .newsrc.eld file to reflect the change of nntp server."
   (interactive
    (list gnus-select-method (gnus-read-method "Move to method: ")))
-  
+
   ;; First start Gnus.
   (let ((gnus-activate-level 0)
 	(nnmail-spool-file nil))
@@ -59,15 +61,18 @@ Update the .newsrc.eld file to reflect the change of nntp server."
   "Move group INFO from FROM-SERVER to TO-SERVER."
   (let ((group (gnus-info-group info))
 	to-active hashtb type mark marks
-	to-article to-reads to-marks article)
+	to-article to-reads to-marks article
+	act-articles)
     (gnus-message 7 "Translating %s..." group)
     (when (gnus-request-group group nil to-server)
       (setq to-active (gnus-parse-active)
-	    hashtb (gnus-make-hashtable 1024))
+	    hashtb (gnus-make-hashtable 1024)
+	    act-articles (gnus-uncompress-range to-active))
       ;; Fetch the headers from the `to-server'.
       (when (and to-active
+		 act-articles
 		 (setq type (gnus-retrieve-headers
-			     (gnus-uncompress-range to-active)
+			     act-articles
 			     group to-server)))
 	;; Convert HEAD headers.  I don't care.
 	(when (eq type 'headers)
@@ -77,7 +82,7 @@ Update the .newsrc.eld file to reflect the change of nntp server."
 	(goto-char (point-min))
 	(while (looking-at
 		"^[0-9]+\t[^\t]*\t[^\t]*\t[^\t]*\t\\([^\t]*\\)\t")
-	  (gnus-sethash 
+	  (gnus-sethash
 	   (buffer-substring (match-beginning 1) (match-end 1))
 	   (read (current-buffer))
 	   hashtb)
@@ -86,7 +91,7 @@ Update the .newsrc.eld file to reflect the change of nntp server."
 	(when (and (gnus-request-group group nil from-server)
 		   (gnus-active group)
 		   (setq type (gnus-retrieve-headers
-			       (gnus-uncompress-range 
+			       (gnus-uncompress-range
 				(gnus-active group))
 			       group from-server)))
 	  ;; Make it easier to map marks.
@@ -108,24 +113,24 @@ Update the .newsrc.eld file to reflect the change of nntp server."
 	  (goto-char (point-min))
 	  (while (looking-at
 		  "^[0-9]+\t[^\t]*\t[^\t]*\t[^\t]*\t\\([^\t]*\\)\t")
-	    (setq to-article 
-		  (gnus-gethash 
-		   (buffer-substring (match-beginning 1) (match-end 1))
-		   hashtb))
-	    ;; Add this article to the list of read articles.
-	    (push to-article to-reads)
-	    ;; See if there are any marks and then add them.
-	    (when (setq mark (assq (read (current-buffer)) marks))
-	      (setq marks (delq mark marks))
-	      (setcar mark to-article)
-	      (push mark to-marks))
-	    (forward-line 1))
+	    (when (setq to-article
+			(gnus-gethash
+			 (buffer-substring (match-beginning 1) (match-end 1))
+			 hashtb))
+	      ;; Add this article to the list of read articles.
+	      (push to-article to-reads)
+	      ;; See if there are any marks and then add them.
+	      (when (setq mark (assq (read (current-buffer)) marks))
+		(setq marks (delq mark marks))
+		(setcar mark to-article)
+		(push mark to-marks))
+	      (forward-line 1)))
 	  ;; Now we know what the read articles are and what the
 	  ;; article marks are.  We transform the information
 	  ;; into the Gnus info format.
-	  (setq to-reads 
-		(gnus-range-add 
-		 (gnus-compress-sequence (sort to-reads '<) t)
+	  (setq to-reads
+		(gnus-range-add
+		 (gnus-compress-sequence (and to-reads (sort to-reads '<)) t)
 		 (cons 1 (1- (car to-active)))))
 	  (gnus-info-set-read info to-reads)
 	  ;; Do the marks.  I'm sure y'all understand what's
@@ -142,7 +147,8 @@ Update the .newsrc.eld file to reflect the change of nntp server."
 			(cons article (cdr a)))))
 	    (setq a lists)
 	    (while a
-	      (setcdr (car a) (gnus-compress-sequence (sort (cdar a) '<)))
+	      (setcdr (car a) (gnus-compress-sequence
+			       (and (cdar a) (sort (cdar a) '<))))
 	      (pop a))
 	    (gnus-info-set-marks info lists t)))))
     (gnus-message 7 "Translating %s...done" group)))
@@ -152,7 +158,7 @@ Update the .newsrc.eld file to reflect the change of nntp server."
   (interactive
    (let ((info (gnus-get-info (gnus-group-group-name))))
      (list info (gnus-find-method-for-group (gnus-info-group info))
-	   (gnus-read-method (format "Move group %s to method: " 
+	   (gnus-read-method (format "Move group %s to method: "
 				     (gnus-info-group info))))))
   (save-excursion
     (gnus-move-group-to-server info from-server to-server)
@@ -160,7 +166,7 @@ Update the .newsrc.eld file to reflect the change of nntp server."
     (gnus-info-set-method info to-server t)
     ;; We also have to change the name of the group and stuff.
     (let* ((group (gnus-info-group info))
-	   (new-name (gnus-group-prefixed-name 
+	   (new-name (gnus-group-prefixed-name
 		      (gnus-group-real-name group) to-server)))
       (gnus-info-set-group info new-name)
       (gnus-sethash new-name (gnus-gethash group gnus-newsrc-hashtb)