Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-339

Merge from gnus--rel--5.10

Patches applied:

 * gnus--rel--5.10  (patch 76)

   - Update from CVS

2005-05-30  Reiner Steib  <Reiner.Steib@gmx.de>

   * lisp/gnus/gnus-agent.el (gnus-agent-regenerate-group)
   (gnus-agent-fetch-articles): Replace `string-to-int' by
   `string-to-number'.
   * lisp/gnus/gnus-art.el (gnus-button-fetch-group): Ditto.
   * lisp/gnus/gnus-cache.el (gnus-cache-generate-active)
   (gnus-cache-articles-in-group): Ditto.
   * lisp/gnus/gnus-group.el (gnus-group-set-current-level)
   (gnus-group-insert-group-line): Ditto.
   * lisp/gnus/gnus-score.el (gnus-score-set-expunge-below)
   (gnus-score-set-mark-below, gnus-summary-score-effect)
   (gnus-summary-score-entry): Ditto.
   * lisp/gnus/gnus-soup.el (gnus-soup-send-packet, gnus-soup-parse-areas)
   (gnus-soup-pack): Ditto.
   * lisp/gnus/gnus-spec.el (gnus-xmas-format): Ditto.
   * lisp/gnus/gnus-start.el (gnus-newsrc-to-gnus-format): Ditto.
   * lisp/gnus/gnus-sum.el (gnus-create-xref-hashtb): Ditto.
   * lisp/gnus/gnus-uu.el (gnus-uu-expand-numbers): Ditto.
   * lisp/gnus/nnbabyl.el (nnbabyl-article-group-number): Ditto.
   * lisp/gnus/nndb.el (nndb-get-remote-expire-response): Ditto.
   * lisp/gnus/nndiary.el (nndiary-parse-schedule-value)
   (nndiary-string-to-number, nndiary-request-replace-article)
   (nndiary-request-article): Ditto.
   * lisp/gnus/nndoc.el (nndoc-rnews-body-end, nndoc-mbox-body-end): Ditto.
   * lisp/gnus/nndraft.el (nndraft-articles, nndraft-request-group): Ditto.
   * lisp/gnus/nneething.el (nneething-make-head): Ditto.
   * lisp/gnus/nnfolder.el (nnfolder-request-article)
   (nnfolder-retrieve-headers): Ditto.
   * lisp/gnus/nnheader.el (nnheader-file-to-number): Ditto.
   * lisp/gnus/nnkiboze.el (nnkiboze-request-article): Ditto.
   * lisp/gnus/nnmail.el (nnmail-process-unix-mail-format)
   (nnmail-process-babyl-mail-format): Ditto.
   * lisp/gnus/nnmbox.el (nnmbox-read-mbox, nnmbox-article-group-number): Ditto.
   * lisp/gnus/nnmh.el (nnmh-update-gnus-unreads, nnmh-active-number)
   (nnmh-request-create-group, nnmh-request-list-1)
   (nnmh-request-group, nnmh-request-article): Ditto.
   * lisp/gnus/nnml.el (nnml-request-replace-article, nnml-request-article): Ditto.
   * lisp/gnus/nnrss.el (nnrss-find-rss-via-syndic8): Ditto.
   * lisp/gnus/nnsoup.el (nnsoup-make-active): Ditto.
   * lisp/gnus/nnspool.el (nnspool-find-id, nnspool-request-group): Ditto.
   * lisp/gnus/nntp.el (nntp-find-group-and-number)
   (nntp-retrieve-headers-with-xover): Ditto.
   * lisp/gnus/pgg-gpg.el (pgg-gpg-snarf-keys-region): Ditto.
   * lisp/gnus/pgg-parse.el (pgg-read-body, pgg-read-bytes)
   (pgg-format-key-identifier): Ditto.
   * lisp/gnus/pop3.el (pop3-last, pop3-stat): Ditto.
   * lisp/gnus/qp.el (quoted-printable-decode-region): Ditto.

   * lisp/gnus/spam-report.el (spam-report-url-ping-mm-url): Use format instead
   of concat.

1 files changed, 8 insertions, 8 deletions

diff --git a/lisp/gnus/nndiary.el b/lisp/gnus/nndiary.el
index de33cd156c6..e4b087eec2e 100644
--- a/lisp/gnus/nndiary.el
+++ b/lisp/gnus/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)
@@ -1281,14 +1281,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"))
@@ -1315,12 +1315,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)