From: yamaoka <yamaoka>
Date: Mon, 30 May 2005 23:26:08 +0000 (+0000)
Subject: Synch to No Gnus 200505301445.
X-Git-Tag: t-gnus-6_17_4-quimby-~484
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=718035bfa8243f8ee6b0f210d55d240dfd5aa998;p=elisp%2Fgnus.git-

Synch to No Gnus 200505301445.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bd646cd..cca86f4 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,56 @@
+2005-05-30  Reiner Steib  <Reiner.Steib@gmx.de>
+
+	* encrypt.el (encrypt-xor-process-buffer): Replace `string-to-int'
+	by `string-to-number'.
+	* gnus-agent.el (gnus-agent-regenerate-group)
+	(gnus-agent-fetch-articles): Ditto.
+	* gnus-art.el (gnus-button-fetch-group): Ditto.
+	* gnus-cache.el (gnus-cache-generate-active)
+	(gnus-cache-articles-in-group): Ditto.
+	* gnus-group.el (gnus-group-set-current-level)
+	(gnus-group-insert-group-line): Ditto.
+	* gnus-score.el (gnus-score-set-expunge-below)
+	(gnus-score-set-mark-below, gnus-summary-score-effect)
+	(gnus-summary-score-entry): Ditto.
+	* gnus-soup.el (gnus-soup-send-packet, gnus-soup-parse-areas)
+	(gnus-soup-pack): Ditto.
+	* gnus-spec.el (gnus-xmas-format): Ditto.
+	* gnus-start.el (gnus-newsrc-to-gnus-format): Ditto.
+	* gnus-sum.el (gnus-create-xref-hashtb): Ditto.
+	* gnus-uu.el (gnus-uu-expand-numbers): Ditto.
+	* nnbabyl.el (nnbabyl-article-group-number): Ditto.
+	* nndb.el (nndb-get-remote-expire-response): Ditto.
+	* nndiary.el (nndiary-parse-schedule-value)
+	(nndiary-string-to-number, nndiary-request-replace-article)
+	(nndiary-request-article): Ditto.
+	* nndoc.el (nndoc-rnews-body-end, nndoc-mbox-body-end): Ditto.
+	* nndraft.el (nndraft-articles, nndraft-request-group): Ditto.
+	* nneething.el (nneething-make-head): Ditto.
+	* nnfolder.el (nnfolder-request-article)
+	(nnfolder-retrieve-headers): Ditto.
+	* nnheader.el (nnheader-file-to-number): Ditto.
+	* nnkiboze.el (nnkiboze-request-article): Ditto.
+	* nnmail.el (nnmail-process-unix-mail-format)
+	(nnmail-process-babyl-mail-format): Ditto.
+	* nnmbox.el (nnmbox-read-mbox, nnmbox-article-group-number): Ditto.
+	* nnmh.el (nnmh-update-gnus-unreads, nnmh-active-number)
+	(nnmh-request-create-group, nnmh-request-list-1)
+	(nnmh-request-group, nnmh-request-article): Ditto.
+	* nnml.el (nnml-request-replace-article, nnml-request-article): Ditto.
+	* nnrss.el (nnrss-find-rss-via-syndic8): Ditto.
+	* nnsoup.el (nnsoup-make-active): Ditto.
+	* nnspool.el (nnspool-find-id, nnspool-request-group): Ditto.
+	* nntp.el (nntp-find-group-and-number)
+	(nntp-retrieve-headers-with-xover): Ditto.
+	* pgg-gpg.el (pgg-gpg-snarf-keys-region): Ditto.
+	* pgg-parse.el (pgg-read-body, pgg-read-bytes)
+	(pgg-format-key-identifier): Ditto.
+	* pop3.el (pop3-last, pop3-stat): Ditto.
+	* qp.el (quoted-printable-decode-region): Ditto.
+
+	* spam-report.el (spam-report-url-ping-mm-url): Use format instead
+	of concat.
+
 2005-05-30  Katsumi Yamaoka  <yamaoka@jpl.org>
 
 	* gnus-agent.el (gnus-category-mode): Use gnus-run-mode-hooks.
diff --git a/lisp/encrypt.el b/lisp/encrypt.el
index 2df548e..9337272 100644
--- a/lisp/encrypt.el
+++ b/lisp/encrypt.el
@@ -218,7 +218,7 @@ Format example:
 	(progn
 	  (setq new-list (reverse (split-string bs)))
 	  (dolist (x new-list)
-	    (setq x (string-to-int x))
+	    (setq x (string-to-number x))
 	    (insert (format "%c" (logxor x passphrase-sum))))))
       (buffer-substring-no-properties (point-min) (point-max)))))
 
diff --git a/lisp/gnus-agent.el b/lisp/gnus-agent.el
index 8ba772d..6368b57 100644
--- a/lisp/gnus-agent.el
+++ b/lisp/gnus-agent.el
@@ -1574,7 +1574,7 @@ downloaded into the agent."
                           (while (looking-at "\\([^: \n]+\\):\\([0-9]+\\) *")
                             (push (cons (buffer-substring (match-beginning 1)
                                                           (match-end 1))
-                                        (string-to-int
+                                        (string-to-number
 					 (buffer-substring (match-beginning 2)
 							   (match-end 2))))
                                   crosses)
@@ -3789,7 +3789,7 @@ If REREAD is not nil, downloaded articles are marked as unread."
 	   (dir (file-name-directory file))
 	   point
 	   (downloaded (if (file-exists-p dir)
-			   (sort (mapcar (lambda (name) (string-to-int name))
+			   (sort (mapcar (lambda (name) (string-to-number name))
 					 (directory-files dir nil "^[0-9]+$" t))
 				 '>)
 			 (progn (gnus-make-directory dir) nil)))
diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index 4405c24..7b1a8e6 100644
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -7291,7 +7291,7 @@ specified by `gnus-button-alist'."
 				     (match-string 3 address)
 				   "nntp")))
        nil nil nil
-       (and (match-end 6) (list (string-to-int (match-string 6 address))))))))
+       (and (match-end 6) (list (string-to-number (match-string 6 address))))))))
 
 (defun gnus-url-parse-query-string (query &optional downcase)
   (let (retval pairs cur key val)
diff --git a/lisp/gnus-cache.el b/lisp/gnus-cache.el
index 2516924..5ddbfc5 100644
--- a/lisp/gnus-cache.el
+++ b/lisp/gnus-cache.el
@@ -494,7 +494,7 @@ Returns the list of articles removed."
 	articles)
     (when (file-exists-p dir)
       (setq articles
-	    (sort (mapcar (lambda (name) (string-to-int name))
+	    (sort (mapcar (lambda (name) (string-to-number name))
 			  (directory-files dir nil "^[0-9]+$" t))
 		  '<))
       ;; Update the cache active file, just to synch more.
@@ -684,7 +684,7 @@ If LOW, update the lower bound instead."
     ;; Separate articles from all other files and directories.
     (while files
       (if (string-match "^[0-9]+$" (file-name-nondirectory (car files)))
-	  (push (string-to-int (file-name-nondirectory (pop files))) nums)
+	  (push (string-to-number (file-name-nondirectory (pop files))) nums)
 	(push (pop files) alphs)))
     ;; If we have nums, then this is probably a valid group.
     (when (setq nums (sort nums '<))
diff --git a/lisp/gnus-group.el b/lisp/gnus-group.el
index 6468f90..fea6f38 100644
--- a/lisp/gnus-group.el
+++ b/lisp/gnus-group.el
@@ -1505,7 +1505,7 @@ if it is a string, only list groups matching REGEXP."
 	 (eval gnus-group-line-format-spec)))
      `(gnus-group ,(gnus-intern-safe gnus-tmp-group gnus-active-hashtb)
 		  gnus-unread ,(if (numberp number)
-				   (string-to-int gnus-tmp-number-of-unread)
+				   (string-to-number gnus-tmp-number-of-unread)
 				 t)
 		  gnus-marked ,gnus-tmp-marked-mark
 		  gnus-indentation ,gnus-group-indentation
@@ -3331,7 +3331,7 @@ Uses the process/prefix convention."
     (progn
       (unless (gnus-group-process-prefix current-prefix-arg)
 	(error "No group on the current line"))
-      (string-to-int
+      (string-to-number
        (let ((s (read-string
 		 (format "Level (default %s): "
 			 (or (gnus-group-group-level)
diff --git a/lisp/gnus-offline.el b/lisp/gnus-offline.el
index 0e1655a..cfd95a4 100644
--- a/lisp/gnus-offline.el
+++ b/lisp/gnus-offline.el
@@ -798,10 +798,10 @@ Please check your .emacs or .gnus.el to work nnspool fine.")
   "*Set interval time for gnus-daemon."
   (interactive)
   (setq gnus-offline-interval-time
-	(string-to-int (read-from-minibuffer
-			(format (gnus-offline-gettext 'interval-time-1)
-				gnus-offline-interval-time)
-			nil)))
+	(string-to-number (read-from-minibuffer
+			   (format (gnus-offline-gettext 'interval-time-1)
+				   gnus-offline-interval-time)
+			   nil)))
   (if (< gnus-offline-interval-time 2)
       (progn
 	(message "%s" (gnus-offline-gettext 'interval-time-2))
diff --git a/lisp/gnus-ofsetup.el b/lisp/gnus-ofsetup.el
index 5bfc6df..afbce50 100644
--- a/lisp/gnus-ofsetup.el
+++ b/lisp/gnus-ofsetup.el
@@ -468,7 +468,7 @@ mail source specifier とか上記のようなキーワードについてもっとよく
       ;; Create a list of mail source specifiers.
       (setq num-of-address
 	    (read-from-minibuffer (gnus-ofsetup-gettext 'setup-11)))
-      (setq i (setq n (string-to-int num-of-address)))
+      (setq i (setq n (string-to-number num-of-address)))
       ;;
       (while (> i 0)
 	(let* ((j (- n (1- i)))
diff --git a/lisp/gnus-score.el b/lisp/gnus-score.el
index 0a125cd..4f9742d 100644
--- a/lisp/gnus-score.el
+++ b/lisp/gnus-score.el
@@ -871,7 +871,7 @@ If optional argument `EXTRA' is non-nil, it's a non-standard overview header."
     ;; If this is an integer comparison, we transform from string to int.
     (if (eq (nth 2 (assoc header gnus-header-index)) 'gnus-score-integer)
 	(if (stringp match)
-	    (setq match (string-to-int match)))
+	    (setq match (string-to-number match)))
       (set-text-properties 0 (length match) nil match))
 
     (unless (eq date 'now)
@@ -936,7 +936,7 @@ EXTRA is the possible non-standard header."
 				      t)
 		     (read-string "Match: ")
 		     (if (y-or-n-p "Use regexp match? ") 'r 's)
-		     (string-to-int (read-string "Score: "))))
+		     (string-to-number (read-string "Score: "))))
   (save-excursion
     (unless (and (stringp match) (> (length match) 0))
       (error "No match"))
@@ -990,7 +990,7 @@ EXTRA is the possible non-standard header."
   "Automatically mark articles with score below SCORE as read."
   (interactive
    (list (or (and current-prefix-arg (prefix-numeric-value current-prefix-arg))
-	     (string-to-int (read-string "Mark below: ")))))
+	     (string-to-number (read-string "Mark below: ")))))
   (setq score (or score gnus-summary-default-score 0))
   (gnus-score-set 'mark (list score))
   (gnus-score-set 'touched '(t))
@@ -1024,7 +1024,7 @@ EXTRA is the possible non-standard header."
   "Automatically expunge articles with score below SCORE."
   (interactive
    (list (or (and current-prefix-arg (prefix-numeric-value current-prefix-arg))
-	     (string-to-int (read-string "Set expunge below: ")))))
+	     (string-to-number (read-string "Set expunge below: ")))))
   (setq score (or score gnus-summary-default-score 0))
   (gnus-score-set 'expunge (list score))
   (gnus-score-set 'touched '(t)))
diff --git a/lisp/gnus-soup.el b/lisp/gnus-soup.el
index 32a2bdd..9459c51 100644
--- a/lisp/gnus-soup.el
+++ b/lisp/gnus-soup.el
@@ -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)
diff --git a/lisp/gnus-spec.el b/lisp/gnus-spec.el
index d75625b..999853b 100644
--- a/lisp/gnus-spec.el
+++ b/lisp/gnus-spec.el
@@ -553,7 +553,7 @@ are supported for %s."
 	 (t
 	  (if (null args)
 	      (error 'wrong-number-of-arguments #'my-format n fstring))
-	  (let* ((minlen (string-to-int (or (match-string 2) "")))
+	  (let* ((minlen (string-to-number (or (match-string 2) "")))
 		 (arg (car args))
 		 (str (if (stringp arg) arg (format "%s" arg)))
 		 (lpad (null (match-string 1)))
diff --git a/lisp/gnus-start.el b/lisp/gnus-start.el
index 3f8a3fd..c29acde 100644
--- a/lisp/gnus-start.el
+++ b/lisp/gnus-start.el
@@ -2627,7 +2627,7 @@ If FORCE is non-nil, the .newsrc file is read."
 	    (cond
 	     ((looking-at "[0-9]+")
 	      ;; We narrow and read a number instead of buffer-substring/
-	      ;; string-to-int because it's faster.  narrow/widen is
+	      ;; string-to-number because it's faster.  narrow/widen is
 	      ;; faster than save-restriction/narrow, and save-restriction
 	      ;; produces a garbage object.
 	      (setq num1 (progn
diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index 684544f..410fb3c 100644
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -5719,7 +5719,7 @@ The resulting hash table is returned, or nil if no Xrefs were found."
 						    (match-end 1)))
 			(substring xrefs (match-beginning 1) (match-end 1))))
 	  (setq number
-		(string-to-int (substring xrefs (match-beginning 2)
+		(string-to-number (substring xrefs (match-beginning 2)
 					  (match-end 2))))
 	  (if (setq entry (gnus-gethash group xref-hashtb))
 	      (setcdr entry (cons number (cdr entry)))
diff --git a/lisp/gnus-uu.el b/lisp/gnus-uu.el
index 9da4de0..0c3c919 100644
--- a/lisp/gnus-uu.el
+++ b/lisp/gnus-uu.el
@@ -1170,7 +1170,7 @@ When called interactively, prompt for REGEXP."
 	  (ignore-errors
 	    (replace-match
 	     (format "%06d"
-		     (string-to-int (buffer-substring
+		     (string-to-number (buffer-substring
 				     (match-beginning 0) (match-end 0)))))))
 	(setq string (buffer-substring 1 (point-max)))
 	(setcar (car string-list) string)
diff --git a/lisp/nnbabyl.el b/lisp/nnbabyl.el
index da4cb9b..9a6678c 100644
--- a/lisp/nnbabyl.el
+++ b/lisp/nnbabyl.el
@@ -491,7 +491,7 @@
     (when (re-search-forward "^X-Gnus-Newsgroup: +\\([^:]+\\):\\([0-9]+\\) "
 			     nil t)
       (cons (buffer-substring (match-beginning 1) (match-end 1))
-	    (string-to-int
+	    (string-to-number
 	     (buffer-substring (match-beginning 2) (match-end 2)))))))
 
 (defun nnbabyl-insert-lines ()
diff --git a/lisp/nndb.el b/lisp/nndb.el
index 533612e..17bbd21 100644
--- a/lisp/nndb.el
+++ b/lisp/nndb.el
@@ -196,7 +196,7 @@ article was posted to nndb")
       ;; otherwise, pull all of the following numbers into the list
       (re-search-forward "follows\r?\n?" nil t)
       (while (re-search-forward "^[0-9]+$" nil t)
-	(push (string-to-int (match-string 0)) list)))
+	(push (string-to-number (match-string 0)) list)))
     list))
 
 (defun nndb-request-expire-articles-remote
diff --git a/lisp/nndiary.el b/lisp/nndiary.el
index bf433ad..ae8bc59 100644
--- a/lisp/nndiary.el
+++ b/lisp/nndiary.el
@@ -601,7 +601,7 @@ all.  This may very well take some time.")
       (nnheader-report 'nndiary "Article %s retrieved" id)
       ;; We return the article number.
       (cons (if group-num (car group-num) group)
-	    (string-to-int (file-name-nondirectory path)))))))
+	    (string-to-number (file-name-nondirectory path)))))))
 
 (deffoo nndiary-request-group (group &optional server dont-check)
   (let ((file-name-coding-system nnmail-pathname-coding-system))
@@ -820,7 +820,7 @@ all.  This may very well take some time.")
 	    ;; we should insert it.  (This situation should never
 	    ;; occur, but one likes to make sure...)
 	    (while (and (looking-at "[0-9]+\t")
-			(< (string-to-int
+			(< (string-to-number
 			    (buffer-substring
 			     (match-beginning 0) (match-end 0)))
 			   article)
@@ -1279,14 +1279,14 @@ all.  This may very well take some time.")
 	  (nnheader-article-to-file-alist nndiary-current-directory))))
 
 
-(defun nndiary-string-to-int (str min &optional max)
-  ;; Like `string-to-int' but barf if STR is not exactly an integer, and not
+(defun nndiary-string-to-number (str min &optional max)
+  ;; Like `string-to-number' but barf if STR is not exactly an integer, and not
   ;; within the specified bounds.
   ;; Signals are caught by `nndiary-schedule'.
   (if (not (string-match "^[ \t]*[0-9]+[ \t]*$" str))
       (nndiary-error "not an integer value")
     ;; else
-    (let ((val (string-to-int str)))
+    (let ((val (string-to-number str)))
       (and (or (< val min)
 	       (and max (> val max)))
 	   (nndiary-error "value out of range"))
@@ -1313,12 +1313,12 @@ all.  This may very well take some time.")
 	 (let ((res (split-string val "-")))
 	   (cond
 	    ((= (length res) 1)
-	     (nndiary-string-to-int (car res) min-or-values max))
+	     (nndiary-string-to-number (car res) min-or-values max))
 	    ((= (length res) 2)
 	     ;; don't know if crontab accepts this, but ensure
 	     ;; that BEG is <= END
-	     (let ((beg (nndiary-string-to-int (car res) min-or-values max))
-		   (end (nndiary-string-to-int (cadr res) min-or-values max)))
+	     (let ((beg (nndiary-string-to-number (car res) min-or-values max))
+		   (end (nndiary-string-to-number (cadr res) min-or-values max)))
 	       (cond ((< beg end)
 		      (cons beg end))
 		     ((= beg end)
diff --git a/lisp/nndoc.el b/lisp/nndoc.el
index 3763654..a82d6ab 100644
--- a/lisp/nndoc.el
+++ b/lisp/nndoc.el
@@ -421,7 +421,7 @@ from the document.")
 	       (search-forward "\n\n" beg t)
 	       (re-search-backward
 		"^Content-Length:[ \t]*\\([0-9]+\\) *$" end t)
-	       (setq len (string-to-int (match-string 1)))
+	       (setq len (string-to-number (match-string 1)))
 	       (search-forward "\n\n" beg t)
 	       (unless (= (setq len (+ (point) len)) (point-max))
 		 (and (< len (point-max))
@@ -444,7 +444,7 @@ from the document.")
 (defun nndoc-rnews-body-end ()
   (and (re-search-backward nndoc-article-begin nil t)
        (forward-line 1)
-       (goto-char (+ (point) (string-to-int (match-string 1))))))
+       (goto-char (+ (point) (string-to-number (match-string 1))))))
 
 (defun nndoc-babyl-type-p ()
   (when (re-search-forward "\^_\^L *\n" nil t)
diff --git a/lisp/nndraft.el b/lisp/nndraft.el
index 4e3eb9c..9061c3a 100644
--- a/lisp/nndraft.el
+++ b/lisp/nndraft.el
@@ -185,7 +185,7 @@
 	   (file-name-coding-system nnmail-pathname-coding-system)
 	   dir file)
       (nnheader-re-read-dir pathname)
-      (setq dir (mapcar (lambda (name) (string-to-int (substring name 1)))
+      (setq dir (mapcar (lambda (name) (string-to-number (substring name 1)))
 			(ignore-errors (directory-files
 					pathname nil "^#[0-9]+#$" t))))
       (dolist (n dir)
@@ -293,7 +293,7 @@
   "Return the list of messages in the group."
   (gnus-make-directory nndraft-current-directory)
   (sort
-   (mapcar 'string-to-int
+   (mapcar 'string-to-number
 	   (directory-files nndraft-current-directory nil "\\`[0-9]+\\'" t))
    '<))
 
diff --git a/lisp/nneething.el b/lisp/nneething.el
index 8987abb..9a7090d 100644
--- a/lisp/nneething.el
+++ b/lisp/nneething.el
@@ -428,7 +428,7 @@ This variable is used as the alternative of `mailcap-mime-extensions'.")
 	     (when (re-search-forward "<[a-zA-Z0-9_]@[-a-zA-Z0-9_]>" 1000 t)
 	       (concat "From: " (match-string 0) "\n"))))
 	 (nneething-from-line (nth 2 atts) file))
-     (if (> (string-to-int (int-to-string (nth 7 atts))) 0)
+     (if (> (string-to-number (int-to-string (nth 7 atts))) 0)
 	 (concat "Chars: " (int-to-string (nth 7 atts)) "\n")
        "")
      (if buffer
diff --git a/lisp/nnfolder.el b/lisp/nnfolder.el
index ddddba6..69cd67b 100644
--- a/lisp/nnfolder.el
+++ b/lisp/nnfolder.el
@@ -201,7 +201,7 @@ the group.  Then the marks file will be regenerated properly by Gnus.")
 		       ((search-backward (concat "\n" nnfolder-article-marker)
 					 nil t)
 			(goto-char (match-end 0))
-			(setq num (string-to-int
+			(setq num (string-to-number
 				   (buffer-substring
 				    (point) (point-at-eol))))
 			(goto-char start)
@@ -211,7 +211,7 @@ the group.  Then the marks file will be regenerated properly by Gnus.")
 		      (search-forward (concat "\n" nnfolder-article-marker)
 				      nil t)
 		      (progn
-			(setq num (string-to-int
+			(setq num (string-to-number
 				   (buffer-substring
 				    (point) (point-at-eol))))
 			(> num article))
@@ -286,7 +286,7 @@ the group.  Then the marks file will be regenerated properly by Gnus.")
 	    (cons nnfolder-current-group
 		  (if (search-forward (concat "\n" nnfolder-article-marker)
 				      nil t)
-		      (string-to-int (buffer-substring
+		      (string-to-number (buffer-substring
 				      (point) (point-at-eol)))
 		    -1))))))))
 
diff --git a/lisp/nnheader.el b/lisp/nnheader.el
index 43c8ffb..586d8ff 100644
--- a/lisp/nnheader.el
+++ b/lisp/nnheader.el
@@ -1315,9 +1315,9 @@ list of headers that match SEQUENCE (see `nntp-retrieve-headers')."
 (defsubst nnheader-file-to-number (file)
   "Take a FILE name and return the article number."
   (if (string= nnheader-numerical-short-files "^[0-9]+$")
-      (string-to-int file)
+      (string-to-number file)
     (string-match nnheader-numerical-short-files file)
-    (string-to-int (match-string 0 file))))
+    (string-to-number (match-string 0 file))))
 
 (defvar nnheader-directory-files-is-safe
   (or (eq system-type 'windows-nt)
diff --git a/lisp/nnir.el b/lisp/nnir.el
index e38c9ab..84ab8d6 100644
--- a/lisp/nnir.el
+++ b/lisp/nnir.el
@@ -907,8 +907,8 @@ pairs (also vectors, actually)."
                            dirnam nnir-wais-remove-prefix))
         (setq group (substitute ?. ?/ (replace-match "" t t dirnam)))
         (push (vector group
-                      (string-to-int artno)
-                      (string-to-int score))
+                      (string-to-number artno)
+                      (string-to-number score))
               artlist))
       (message "Massaging waissearch output...done")
       (apply 'vector
@@ -952,7 +952,7 @@ pairs (also vectors, actually)."
 	(setq group (substitute ?. ?/ (match-string 1 article)))
 	(setq article-num (match-string 2 article))
 	(setq artlist (vconcat artlist (vector (vector group
-						       (string-to-int article-num)
+						       (string-to-number article-num)
 						       1000)))))
       (message "Gathering query output...done")
       artlist)))
@@ -1108,8 +1108,8 @@ Windows NT 4.0."
 	      (setq group (substitute ?. ?\\ group))
 
 	      (push (vector group
-			    (string-to-int artno)
-			    (string-to-int score))
+			    (string-to-number artno)
+			    (string-to-number score))
 		    artlist)))))
 
       (message "Massaging swish++ output...done")
@@ -1195,8 +1195,8 @@ Tested with swish-e-2.0.1 on Windows NT 4.0."
             (setq group (substitute ?. ?\\ group))
 
             (push (vector group
-                          (string-to-int artno)
-                          (string-to-int score))
+                          (string-to-number artno)
+                          (string-to-number score))
                   artlist))))
 
       (message "Massaging swish-e output...done")
@@ -1276,8 +1276,8 @@ Tested with Namazu 2.0.6 on a GNU/Linux system."
 
           ;; stuff results into artlist vector
           (push (vector (substitute ?. ?/ group)
-                        (string-to-int article)
-                        (string-to-int score)) artlist)))
+                        (string-to-number article)
+                        (string-to-number score)) artlist)))
 
       ;; sort artlist by score
       (apply 'vector
diff --git a/lisp/nnkiboze.el b/lisp/nnkiboze.el
index 6ab99dd..4769d80 100644
--- a/lisp/nnkiboze.el
+++ b/lisp/nnkiboze.el
@@ -106,7 +106,7 @@
 	(error "nnkiboze: No xref"))
       (unless (string-match " \\([^ ]+\\):\\([0-9]+\\)" xref)
 	(error "nnkiboze: Malformed xref"))
-      (setq num (string-to-int (match-string 2 xref))
+      (setq num (string-to-number (match-string 2 xref))
 	    group (match-string 1 xref))
       (or (with-current-buffer buffer
 	    (or (and gnus-use-cache (gnus-cache-request-article num group))
diff --git a/lisp/nnmail.el b/lisp/nnmail.el
index 60ce895..bf017b5 100644
--- a/lisp/nnmail.el
+++ b/lisp/nnmail.el
@@ -767,7 +767,7 @@ If SOURCE is a directory spec, try to return the group name component."
       (if (not (save-excursion
 		 (and (re-search-backward
 		       "^Content-Length:[ \t]*\\([0-9]+\\)" start t)
-		      (setq content-length (string-to-int
+		      (setq content-length (string-to-number
 					    (buffer-substring
 					     (match-beginning 1)
 					     (match-end 1))))
@@ -904,7 +904,7 @@ If SOURCE is a directory spec, try to return the group name component."
 	(if (not (re-search-forward
 		  "^Content-Length:[ \t]*\\([0-9]+\\)" nil t))
 	    (setq content-length nil)
-	  (setq content-length (string-to-int (match-string 1)))
+	  (setq content-length (string-to-number (match-string 1)))
 	  ;; We destroy the header, since none of the backends ever
 	  ;; use it, and we do not want to confuse other mailers by
 	  ;; having a (possibly) faulty header.
diff --git a/lisp/nnmbox.el b/lisp/nnmbox.el
index de520b3..fc67039 100644
--- a/lisp/nnmbox.el
+++ b/lisp/nnmbox.el
@@ -476,7 +476,7 @@
     (when (re-search-forward "^X-Gnus-Newsgroup: +\\([^:]+\\):\\([0-9]+\\) "
 			     nil t)
       (cons (buffer-substring (match-beginning 1) (match-end 1))
-	    (string-to-int
+	    (string-to-number
 	     (buffer-substring (match-beginning 2) (match-end 2)))))))
 
 (defun nnmbox-in-header-p (pos)
@@ -681,7 +681,7 @@
 		    (let (alist)
 		      (while (re-search-forward " \\([^:]+\\):\\([0-9]+\\)" end-header t)
 			(push (cons (match-string 1)
-				    (string-to-int (match-string 2))) alist))
+				    (string-to-number (match-string 2))) alist))
 		      (nnmbox-insert-newsgroup-line alist))
 		  ;; this is really a new article
 		  (nnmbox-save-mail
diff --git a/lisp/nnmh.el b/lisp/nnmh.el
index 81d547b..42d1383 100644
--- a/lisp/nnmh.el
+++ b/lisp/nnmh.el
@@ -152,7 +152,7 @@ as unread by Gnus.")
 	 (file-exists-p file)
 	 (not (file-directory-p file))
 	 (save-excursion (nnmail-find-file file))
-	 (string-to-int (file-name-nondirectory file)))))
+	 (string-to-number (file-name-nondirectory file)))))
 
 (deffoo nnmh-request-group (group &optional server dont-check)
   (nnheader-init-server-buffer)
@@ -178,7 +178,7 @@ as unread by Gnus.")
 	(nnheader-re-read-dir pathname)
 	(setq dir
 	      (sort
-	       (mapcar 'string-to-int
+	       (mapcar 'string-to-number
 		       (directory-files pathname nil "^[0-9]+$" t))
 	       '<))
 	(cond
@@ -224,7 +224,7 @@ as unread by Gnus.")
 	(nnmh-request-list-1 rdir))))
   ;; For each directory, generate an active file line.
   (unless (string= (expand-file-name nnmh-toplev) dir)
-    (let ((files (mapcar 'string-to-int
+    (let ((files (mapcar 'string-to-number
 			 (directory-files dir nil "^[0-9]+$" t))))
       (when files
 	(save-excursion
@@ -358,7 +358,7 @@ as unread by Gnus.")
 	    nnmh-group-alist)
       (nnmh-possibly-create-directory group)
       (nnmh-possibly-change-directory group server)
-      (let ((articles (mapcar 'string-to-int
+      (let ((articles (mapcar 'string-to-number
 			      (directory-files
 			       nnmh-current-directory nil "^[0-9]+$"))))
 	(when articles
@@ -484,7 +484,7 @@ as unread by Gnus.")
 	(gnus-make-directory dir))
       ;; Find the highest number in the group.
       (let ((files (sort
-		    (mapcar 'string-to-int
+		    (mapcar 'string-to-number
 			    (directory-files dir nil "^[0-9]+$"))
 		    '>)))
 	(when files
@@ -507,7 +507,7 @@ as unread by Gnus.")
   ;; articles in this folder.  The articles that are "new" will be
   ;; marked as unread by Gnus.
   (let* ((dir nnmh-current-directory)
-	 (files (sort (mapcar 'string-to-int
+	 (files (sort (mapcar 'string-to-number
 			      (directory-files nnmh-current-directory
 					       nil "^[0-9]+$" t))
 		      '<))
diff --git a/lisp/nnml.el b/lisp/nnml.el
index 02c3d35..b5cf911 100644
--- a/lisp/nnml.el
+++ b/lisp/nnml.el
@@ -213,7 +213,7 @@ marks file will be regenerated properly by Gnus.")
       (nnheader-report 'nnml "Article %s retrieved" id)
       ;; We return the article number.
       (cons (if group-num (car group-num) group)
-	    (string-to-int (file-name-nondirectory path)))))))
+	    (string-to-number (file-name-nondirectory path)))))))
 
 (deffoo nnml-request-group (group &optional server dont-check)
   (let ((file-name-coding-system nnmail-pathname-coding-system))
@@ -427,7 +427,7 @@ marks file will be regenerated properly by Gnus.")
 	    ;; we should insert it.  (This situation should never
 	    ;; occur, but one likes to make sure...)
 	    (while (and (looking-at "[0-9]+\t")
-			(< (string-to-int
+			(< (string-to-number
 			    (buffer-substring
 			     (match-beginning 0) (match-end 0)))
 			   article)
diff --git a/lisp/nnrss.el b/lisp/nnrss.el
index a585468..3a2677c 100644
--- a/lisp/nnrss.el
+++ b/lisp/nnrss.el
@@ -900,7 +900,7 @@ whether they are `offsite' or `onsite'."
 		  (selection
 		   (mapcar (lambda (listinfo)
 			     (cons (cdr (assoc "sitename" listinfo))
-				   (string-to-int
+				   (string-to-number
 				    (cdr (assoc "feedid" listinfo)))))
 			   feedinfo)))
 	      (cdr (assoc
diff --git a/lisp/nnsoup.el b/lisp/nnsoup.el
index c41f22d..636f1b6 100644
--- a/lisp/nnsoup.el
+++ b/lisp/nnsoup.el
@@ -750,9 +750,9 @@ backend for the messages.")
   (let ((files (sort (directory-files nnsoup-directory t "IDX$")
 		     (lambda (f1 f2)
 		       (< (progn (string-match "/\\([0-9]+\\)\\." f1)
-				 (string-to-int (match-string 1 f1)))
+				 (string-to-number (match-string 1 f1)))
 			  (progn (string-match "/\\([0-9]+\\)\\." f2)
-				 (string-to-int (match-string 1 f2)))))))
+				 (string-to-number (match-string 1 f2)))))))
 	active group lines ident elem min)
     (set-buffer (get-buffer-create " *nnsoup work*"))
     (dolist (file files)
diff --git a/lisp/nnspool.el b/lisp/nnspool.el
index 996ab64..f9475d7 100644
--- a/lisp/nnspool.el
+++ b/lisp/nnspool.el
@@ -247,7 +247,7 @@ there.")
 	;; Yes, completely empty spool directories *are* possible.
 	;; Fix by Sudish Joseph <joseph@cis.ohio-state.edu>
 	(when (setq dir (directory-files pathname nil "^[0-9]+$" t))
-	  (setq dir (sort (mapcar 'string-to-int dir) '<)))
+	  (setq dir (sort (mapcar 'string-to-number dir) '<)))
 	(if dir
 	    (nnheader-insert
 	     "211 %d %d %d %s\n" (length dir) (car dir)
@@ -432,7 +432,7 @@ there.")
       (call-process "grep" nil t nil (regexp-quote id) nnspool-history-file))
     (goto-char (point-min))
     (when (looking-at "<[^>]+>[ \t]+[-0-9~]+[ \t]+\\([^ /\t\n]+\\)/\\([0-9]+\\)[ \t\n]")
-      (cons (match-string 1) (string-to-int (match-string 2))))))
+      (cons (match-string 1) (string-to-number (match-string 2))))))
 
 (defun nnspool-find-file (file)
   "Insert FILE in server buffer safely."
diff --git a/lisp/nntp.el b/lisp/nntp.el
index 6478bae..05f4cc3 100644
--- a/lisp/nntp.el
+++ b/lisp/nntp.el
@@ -1633,7 +1633,7 @@ password contained in '~/.nntp-authinfo'."
         (when (<= count 1)
           (goto-char (point-min))
           (when (re-search-forward "^[0-9][0-9][0-9] .*\n\\([0-9]+\\)" nil t)
-            (let ((low-limit (string-to-int
+            (let ((low-limit (string-to-number
 			      (buffer-substring (match-beginning 1) 
 						(match-end 1)))))
               (while (and articles (<= (car articles) low-limit))
@@ -1703,7 +1703,7 @@ password contained in '~/.nntp-authinfo'."
       (goto-char (point-min))
       ;; We first find the number by looking at the status line.
       (let ((number (and (looking-at "2[0-9][0-9] +\\([0-9]+\\) ")
-			 (string-to-int
+			 (string-to-number
 			  (buffer-substring (match-beginning 1)
 					    (match-end 1)))))
 	    newsgroups xref)
@@ -1741,7 +1741,7 @@ password contained in '~/.nntp-authinfo'."
 		    "\\([^ :]+\\):\\([0-9]+\\)")
 		  xref))
 	    (setq group (match-string 1 xref)
-		  number (string-to-int (match-string 2 xref))))
+		  number (string-to-number (match-string 2 xref))))
 	   ((and (setq newsgroups
 		       (mail-fetch-field "newsgroups"))
 		 (not (string-match "," newsgroups)))
diff --git a/lisp/pop3.el b/lisp/pop3.el
index f9c73a0..e56e806 100644
--- a/lisp/pop3.el
+++ b/lisp/pop3.el
@@ -640,8 +640,8 @@ If NOW, use that time instead."
   "Return the number of messages in the maildrop and the maildrop's size."
   (pop3-send-command process "STAT")
   (let ((response (pop3-read-response process t)))
-    (list (string-to-int (nth 1 (split-string response " ")))
-	  (string-to-int (nth 2 (split-string response " "))))))
+    (list (string-to-number (nth 1 (split-string response " ")))
+	  (string-to-number (nth 2 (split-string response " "))))))
 
 (defun pop3-retr (process msg crashbuf)
   "Retrieve message-id MSG to buffer CRASHBUF."
@@ -667,7 +667,7 @@ If NOW, use that time instead."
   "Return highest accessed message-id number for the session."
   (pop3-send-command process "LAST")
   (let ((response (pop3-read-response process t)))
-    (string-to-int (nth 1 (split-string response " ")))))
+    (string-to-number (nth 1 (split-string response " ")))))
 
 (defun pop3-rset (process)
   "Remove all delete marks from current maildrop."
@@ -712,7 +712,7 @@ where
 	  (apply 'narrow-to-region (pop3-get-extended-response process))
 	  (goto-char (point-min))
 	  (while (looking-at "\\([^ \n\t]*\\) \\([^ \n\t]*\\)")
-	    (setq msgno (string-to-int (match-string 1))
+	    (setq msgno (string-to-number (match-string 1))
 		  uidl (match-string 2))
 	    (push (cons msgno uidl) pairs)
 	    (beginning-of-line 2))
@@ -741,8 +741,8 @@ where
 	  (apply 'narrow-to-region (pop3-get-extended-response process))
 	  (goto-char (point-min))
 	  (while (looking-at "\\([^ \n\t]*\\) \\([^ \n\t]*\\)")
-	    (setq msgno (string-to-int (match-string 1))
-		  len (string-to-int (match-string 2)))
+	    (setq msgno (string-to-number (match-string 1))
+		  len (string-to-number (match-string 2)))
 	    (push (cons msgno len) pairs)
 	    (beginning-of-line 2))
 	  (cons (length pairs) (nreverse pairs)))))))
diff --git a/lisp/qp.el b/lisp/qp.el
index e458dc2..4558777 100644
--- a/lisp/qp.el
+++ b/lisp/qp.el
@@ -69,7 +69,7 @@ them into characters should be done separately."
 	  (cond ((eq (char-after (1+ (point))) ?\n)
 		 (delete-char 2))
 		((looking-at "=[0-9A-F][0-9A-F]")
-		 (let ((byte (string-to-int (buffer-substring (1+ (point))
+		 (let ((byte (string-to-number (buffer-substring (1+ (point))
 							      (+ 3 (point)))
 					    16)))
 		   (mm-insert-byte byte 1)
diff --git a/lisp/spam-report.el b/lisp/spam-report.el
index 6d12ef8..4f1ed0c 100644
--- a/lisp/spam-report.el
+++ b/lisp/spam-report.el
@@ -218,14 +218,14 @@ symbol `ask', query before flushing the queue file."
 the external program specified in `mm-url-program' to connect to
 server."
   (with-temp-buffer
-    (let ((url (concat "http://" host report)))
+    (let ((url (format "http://%s%s" host report)))
       (mm-url-insert url t))))
 
 ;;;###autoload
 (defun spam-report-url-to-file (host report)
   "Collect spam report requests in `spam-report-requests-file'.
 Customize `spam-report-url-ping-function' to use this function."
-  (let ((url (concat "http://" host report))
+  (let ((url (format "http://%s%s" host report))
 	(file spam-report-requests-file))
     (gnus-make-directory (file-name-directory file))
     (gnus-message 9 "Writing URL `%s' to file `%s'" url file)