Synch to No Gnus 200506270911.

[elisp/gnus.git-] / lisp / gnus-soup.el

diff --git a/lisp/gnus-soup.el b/lisp/gnus-soup.el
index 2b9d305..9459c51 100644 (file)
--- a/lisp/gnus-soup.el
+++ b/lisp/gnus-soup.el
@@ -278,7 +278,7 @@ Note -- this function hasn't been implemented yet."
 If NOT-ALL, don't pack ticked articles."
   (let ((gnus-expert-user t)
        (gnus-large-newsgroup nil)
-       (entry (gnus-gethash group gnus-newsrc-hashtb)))
+       (entry (gnus-group-entry group)))
     (when (or (null entry)
              (eq (car entry) t)
              (and (car entry)
@@ -350,9 +350,9 @@ If NOT-ALL, don't pack ticked articles."
         (packer (if (< (string-match "%s" packer)
                        (string-match "%d" packer))
                     (format packer files
-                            (string-to-int (gnus-soup-unique-prefix dir)))
+                            (string-to-number (gnus-soup-unique-prefix dir)))
                   (format packer
-                          (string-to-int (gnus-soup-unique-prefix dir))
+                          (string-to-number (gnus-soup-unique-prefix dir))
                           files)))
         (dir (expand-file-name dir)))
     (gnus-make-directory dir)
@@ -386,7 +386,7 @@ though the two last may be nil if they are missing."
                        (and (eq (preceding-char) ?\t)
                             (gnus-soup-field))
                        (and (eq (preceding-char) ?\t)
-                            (string-to-int (gnus-soup-field))))
+                            (string-to-number (gnus-soup-field))))
                areas)
          (when (eq (preceding-char) ?\t)
            (beginning-of-line 2)))
@@ -536,7 +536,7 @@ Return whether the unpacking was successful."
                (error "Bad header"))
              (forward-line 1)
              (setq beg (point)
-                   end (+ (point) (string-to-int
+                   end (+ (point) (string-to-number
                                    (buffer-substring
                                     (match-beginning 1) (match-end 1)))))
              (switch-to-buffer tmp-buf)