*** empty log message ***

[gnus] / lisp / gnus-move.el

diff --git a/lisp/gnus-move.el b/lisp/gnus-move.el
index 9e669cc..ba8b9c2 100644 (file)
--- 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,11 +25,10 @@
 
 ;;; Code:
 
-(require 'gnus-load)
+(require 'gnus)
 (require 'gnus-start)
 (require 'gnus-int)
 (require 'gnus-range)
-(require 'gnus)
 
 ;;;
 ;;; Moving by comparing Message-ID's.
@@ -41,7 +40,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))
@@ -64,10 +63,12 @@ Update the .newsrc.eld file to reflect the change of nntp server."
     (gnus-message 7 "Translating %s..." group)
     (when (gnus-request-group group nil to-server)
       (setq to-active (gnus-parse-active)
-           hashtb (make-vector 1023 0))
+           hashtb (gnus-make-hashtable 1024))
       ;; Fetch the headers from the `to-server'.
-      (when (setq type (gnus-retrieve-headers
-                       (car to-active) (cdr to-active)))
+      (when (and to-active
+                (setq type (gnus-retrieve-headers
+                            (gnus-uncompress-range to-active)
+                            group to-server)))
        ;; Convert HEAD headers.  I don't care.
        (when (eq type 'headers)
          (nnvirtual-convert-headers))
@@ -75,9 +76,8 @@ Update the .newsrc.eld file to reflect the change of nntp server."
        (set-buffer nntp-server-buffer)
        (goto-char (point-min))
        (while (looking-at
-               "^[0-9]+\t[^\t]*\t[^\t]*\t[^\t]*\t\\([^\t]*\\)\t"
-               nil t)
-         (gnus-sethash 
+               "^[0-9]+\t[^\t]*\t[^\t]*\t[^\t]*\t\\([^\t]*\\)\t")
+         (gnus-sethash
           (buffer-substring (match-beginning 1) (match-end 1))
           (read (current-buffer))
           hashtb)
@@ -86,8 +86,9 @@ 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
-                              (car (gnus-active group))
-                              (cdr (gnus-active group)))))
+                              (gnus-uncompress-range
+                               (gnus-active group))
+                              group from-server)))
          ;; Make it easier to map marks.
          (let ((mark-lists (gnus-info-marks info))
                ms type m)
@@ -106,10 +107,9 @@ Update the .newsrc.eld file to reflect the change of nntp server."
          (set-buffer nntp-server-buffer)
          (goto-char (point-min))
          (while (looking-at
-                 "^[0-9]+\t[^\t]*\t[^\t]*\t[^\t]*\t\\([^\t]*\\)\t"
-                 nil t)
-           (setq to-article 
-                 (gnus-gethash 
+                 "^[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.
@@ -123,8 +123,8 @@ Update the .newsrc.eld file to reflect the change of nntp server."
          ;; 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 
+         (setq to-reads
+               (gnus-range-add
                 (gnus-compress-sequence (sort to-reads '<) t)
                 (cons 1 (1- (car to-active)))))
          (gnus-info-set-read info to-reads)
@@ -144,7 +144,7 @@ Update the .newsrc.eld file to reflect the change of nntp server."
            (while a
              (setcdr (car a) (gnus-compress-sequence (sort (cdar a) '<)))
              (pop a))
-           (gnus-info-set-marks info lists)))))
+           (gnus-info-set-marks info lists t)))))
     (gnus-message 7 "Translating %s...done" group)))
 
 (defun gnus-group-move-group-to-server (info from-server to-server)
@@ -152,7 +152,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 +160,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)