Description: use string-to-number instead of string-to-int deprecated in emacs 26
Author: HIGUCHI Daisuke (VDR dai) <dai@debian.org>
Bug-Debian: https://bugs.debian.org/916869
Last-Update: 2018-12-27
Forwarded: no

Index: t-code/lisp/eelll.el
===================================================================
--- t-code.orig/lisp/eelll.el
+++ t-code/lisp/eelll.el
@@ -207,7 +207,7 @@
 	(error "Îý½¬¥Æ¥­¥¹¥È%s¤Ï¤¢¤ê¤Þ¤»¤ó¡£" (if num (int-to-string num) "")))
     (setq eelll-lesson-string (buffer-substring (match-beginning 1)
 						(match-end 1))
-	  eelll-lesson-no (string-to-int eelll-lesson-string))
+	  eelll-lesson-no (string-to-number eelll-lesson-string))
     (setq eelll-first-hand (looking-at "[Rr]"))
     (setq eelll-second-hand (looking-at ".[Rr]"))
     (setq eelll-upper-row (looking-at "..!"))
@@ -611,7 +611,7 @@ EmacsÆâÉô¤Îcompletion¤Î¼ÂÁõ¾å¤ÎÌäÂê¤Î¤¿¤
 			      (if pos (cons 'hist pos) 'hist))))))
 	    (if (string= str "")
 		nil
-	      (list (string-to-int str)))))
+	      (list (string-to-number str)))))
       (fset 'minibuffer-completion-help orig-minibuffer-completion-help))))
 
 (defun eelll-minibuffer-completion-help ()
@@ -630,7 +630,7 @@ EmacsÆâÉô¤Îcompletion¤Î¼ÂÁõ¾å¤ÎÌäÂê¤Î¤¿¤
 `display-completion-list'¤òÃÖ¤­´¹¤¨¤ë¡£"
   (princ "    ---- Îý½¬¥Æ¥­¥¹¥È°ìÍ÷ ----\n")
   (setq x (sort x (lambda (x y)
-		    (< (string-to-int x) (string-to-int y)))))
+		    (< (string-to-number x) (string-to-number y)))))
   (while x
     (princ (car x))
     (princ ":")
@@ -890,11 +890,11 @@ EmacsÆâÉô¤Îcompletion¤Î¼ÂÁõ¾å¤ÎÌäÂê¤Î¤¿¤
 (defun eelll-current-time ()
   (let ((str (current-time-string)))
     (string-match "\\([0-9][0-9]\\):\\([0-9][0-9]\\):\\([0-9][0-9]\\)" str)
-    (+ (* 3600 (string-to-int (substring str
+    (+ (* 3600 (string-to-number (substring str
 					 (match-beginning 1)
 					 (match-end 1))))
-       (* 60 (string-to-int (substring str (match-beginning 2) (match-end 2))))
-       (string-to-int (substring str (match-beginning 3) (match-end 3))))))
+       (* 60 (string-to-number (substring str (match-beginning 2) (match-end 2))))
+       (string-to-number (substring str (match-beginning 3) (match-end 3))))))
 
 (defun eelll-percentage (num den)
   (let ((res%  (min 9999 (/ num (max 1 den)))))
Index: t-code/lisp/tc-is19.el
===================================================================
--- t-code.orig/lisp/tc-is19.el
+++ t-code/lisp/tc-is19.el
@@ -47,7 +47,7 @@
 
 ;;; Code:
 
-(if (<= (string-to-int emacs-version) 18)
+(if (<= (string-to-number emacs-version) 18)
     (error "tc-is19 cannot run on Nemacs/mule-1.x.  Use Mule-2.0 or later!"))
 
 ;;;
Index: t-code/lisp/tc-is20.el
===================================================================
--- t-code.orig/lisp/tc-is20.el
+++ t-code/lisp/tc-is20.el
@@ -26,7 +26,7 @@
 
 ;;; Code:
 
-(if (< (string-to-int emacs-version) 20)
+(if (< (string-to-number emacs-version) 20)
     (error "tc-is20 cannot run on NEmacs/Mule.  Use Emacs 20 or later!"))
 
 ;;;
Index: t-code/lisp/tc-pre-base
===================================================================
--- t-code.orig/lisp/tc-pre-base
+++ t-code/lisp/tc-pre-base
@@ -26,10 +26,10 @@
   (cond ((string-match "XEmacs" emacs-version)
 	 'xemacs)
 	((and (boundp 'mule-version)
-	      (>= (string-to-int mule-version) 4))
+	      (>= (string-to-number mule-version) 4))
 	 'mule-4)
 	((and (boundp 'mule-version)
-	      (= (string-to-int mule-version) 3))
+	      (= (string-to-number mule-version) 3))
 	 'mule-3)
 	((numberp (string-match "^19" emacs-version))
 	 'mule-2)
Index: t-code/lisp/tc-pre-base.in
===================================================================
--- t-code.orig/lisp/tc-pre-base.in
+++ t-code/lisp/tc-pre-base.in
@@ -26,10 +26,10 @@
   (cond ((string-match "XEmacs" emacs-version)
 	 'xemacs)
 	((and (boundp 'mule-version)
-	      (>= (string-to-int mule-version) 4))
+	      (>= (string-to-number mule-version) 4))
 	 'mule-4)
 	((and (boundp 'mule-version)
-	      (= (string-to-int mule-version) 3))
+	      (= (string-to-number mule-version) 3))
 	 'mule-3)
 	((numberp (string-match "^19" emacs-version))
 	 'mule-2)
Index: t-code/lisp/tc-pre.el
===================================================================
--- t-code.orig/lisp/tc-pre.el
+++ t-code/lisp/tc-pre.el
@@ -26,10 +26,10 @@
   (cond ((string-match "XEmacs" emacs-version)
 	 'xemacs)
 	((and (boundp 'mule-version)
-	      (>= (string-to-int mule-version) 4))
+	      (>= (string-to-number mule-version) 4))
 	 'mule-4)
 	((and (boundp 'mule-version)
-	      (= (string-to-int mule-version) 3))
+	      (= (string-to-number mule-version) 3))
 	 'mule-3)
 	((numberp (string-match "^19" emacs-version))
 	 'mule-2)
