[Erc-help] replace `string-to-int' calls ?

[John P. W. <jp...@po...>]

How about replacing the `string-to-int' calls with `string-to-number' ?
(`string-to-int' was made obsolete in the Emacs sources on 2005-05-01)

2005-06-12  John Paul Wallington  <jp...@po...>

	* erc.el (erc-nickname-in-use): Use `string-to-number' instead of
	`string-to-int'.
	* erc-dcc.el (erc-dcc-handle-ctcp-send)
	(erc-dcc-handle-ctcp-chat, erc-dcc-get-file)
	(erc-dcc-chat-accept): Likewise
	* erc-identd.el (erc-identd-start): Likewise.


Index: erc.el
===================================================================
RCS file: /cvsroot/erc/erc/erc.el,v
retrieving revision 1.760
diff -u -r1.760 erc.el
--- erc.el	8 Jun 2005 06:42:50 -0000	1.760
+++ erc.el	15 Jun 2005 21:31:45 -0000
@@ -4278,7 +4278,7 @@
 	  (setq newnick (concat (truncate-string-to-width
 				 nick
 				 (if (and erc-connected nicklen)
-				     (- (string-to-int nicklen) 1)
+				     (- (string-to-number nicklen) 1)
 				   ;; rfc2812 max nick length = 9
 				   ;; we must assume this is the server's setting
 				   ;; if we haven't established a connection yet

Index: erc-dcc.el
===================================================================
RCS file: /cvsroot/erc/erc/erc-dcc.el,v
retrieving revision 1.88
diff -u -r1.88 erc-dcc.el
--- erc-dcc.el	21 Mar 2005 07:56:42 -0000	1.88
+++ erc-dcc.el	15 Jun 2005 21:31:45 -0000
@@ -578,7 +578,7 @@
 	 'dcc-send-offered
 	 ?f filename ?n nick ?u login ?h host
 	 ?s (if (string= size "") "unknown" size))
-	(and (< (string-to-int port) 1025)
+	(and (< (string-to-number port) 1025)
 	     (erc-display-message
 	      nil 'notice proc
 	      'dcc-privileged-port
@@ -587,7 +587,7 @@
 	 'GET (format "%s!%s@%s" nick login host)
 	 nil proc
 	 :ip ip :port port :file filename
-	 :size (string-to-int size))
+	 :size (string-to-number size))
 	(if (and (eq erc-dcc-send-request 'auto)
                  (erc-dcc-auto-mask-p (format "\"%s!%s@%s\"" nick login host)))
 	    (erc-dcc-get-file (car erc-dcc-list) filename proc))))
@@ -630,7 +630,7 @@
 	 nil 'notice proc
 	 'dcc-chat-offered
 	 ?n nick ?u login ?h host ?p port)
-	(and (< (string-to-int port) 1025)
+	(and (< (string-to-number port) 1025)
 	     (erc-display-message
 	      nil 'notice proc
 	    'dcc-privileged-port ?p port))
@@ -825,7 +825,7 @@
 	    (funcall erc-dcc-connect-function
 		     "dcc-get" buffer
 		     (plist-get entry :ip)
-		     (string-to-int (plist-get entry :port))
+		     (string-to-number (plist-get entry :port))
 		     entry))
       (set-process-buffer proc buffer)
       ;; The following two lines make saving as-is work under Windows
@@ -1035,7 +1035,7 @@
           (funcall erc-dcc-connect-function
                    "dcc-chat" nil
                    (plist-get entry :ip)
-                   (string-to-int (plist-get entry :port))
+                   (string-to-number (plist-get entry :port))
                    entry))
     ;; XXX: connected, should we kill the ip/port properties?
     (setq entry (plist-put entry :peer proc))

Index: erc-identd.el
===================================================================
RCS file: /cvsroot/erc/erc/erc-identd.el,v
retrieving revision 1.3
diff -u -r1.3 erc-identd.el
--- erc-identd.el	18 Jan 2005 02:50:55 -0000	1.3
+++ erc-identd.el	15 Jun 2005 21:31:45 -0000
@@ -55,7 +55,7 @@
   (if (null port)
       (setq port 8113)
     (if (stringp port)
-	(setq port (string-to-int port))))
+	(setq port (string-to-number port))))
   (if erc-identd-process
       (delete-process erc-identd-process))
   (setq erc-identd-process