Fix my last change.

[gnus] / lisp / gnus-move.el

diff --git a/lisp/gnus-move.el b/lisp/gnus-move.el
index c61128a..36839c8 100644 (file)
--- a/lisp/gnus-move.el
+++ b/lisp/gnus-move.el
@@ -1,7 +1,8 @@
 ;;; gnus-move.el --- commands for moving Gnus from one server to another
-;; Copyright (C) 1996,97 Free Software Foundation, Inc.
+;; Copyright (C) 1996, 1997, 1998, 1999, 2000
+;;        Free Software Foundation, Inc.
 
-;; Author: Lars Magne Ingebrigtsen <larsi@ifi.uio.no>
+;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
 
 ;; This file is part of GNU Emacs.
@@ -25,6 +26,8 @@
 
 ;;; Code:
 
+(eval-when-compile (require 'cl))
+
 (require 'gnus)
 (require 'gnus-start)
 (require 'gnus-int)
@@ -43,6 +46,7 @@ Update the .newsrc.eld file to reflect the change of nntp server."
 
   ;; First start Gnus.
   (let ((gnus-activate-level 0)
+       (mail-sources nil)
        (nnmail-spool-file nil))
     (gnus))
 
@@ -59,15 +63,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)
@@ -85,6 +92,8 @@ Update the .newsrc.eld file to reflect the change of nntp server."
        ;; Then we read the headers from the `from-server'.
        (when (and (gnus-request-group group nil from-server)
                   (gnus-active group)
+                  (gnus-uncompress-range
+                   (gnus-active group))
                   (setq type (gnus-retrieve-headers
                               (gnus-uncompress-range
                                (gnus-active group))
@@ -108,24 +117,27 @@ 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 (and to-reads (sort to-reads '<)) t)
+                (gnus-compress-sequence
+                 (and (setq to-reads (delq nil 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