--- x-face.el.orig	2003-08-26 19:55:51.000000000 +0900
+++ x-face.el	2018-08-15 10:08:45.050886000 +0900
@@ -595,7 +595,7 @@
 
 (defmacro x-face-read-file-name (prompt dir default mustmatch initial)
   "Read file name interactively."
-  (let ((major (string-to-int emacs-version))
+  (let ((major (string-to-number emacs-version))
 	(minor (and (boundp 'emacs-minor-version) emacs-minor-version)))
     (cond ((> 19 major)
 	   (list 'read-file-name prompt
@@ -752,12 +752,12 @@
 							 'file dirname)))
 					    'file)))
 				    '(quote identity)))
-			     (if (> (string-to-int emacs-version) 18)
+			     (if (> (string-to-number emacs-version) 18)
 				 (list 'directory-files
 				       dirname full match nosort)
 			       (list 'directory-files
 				     dirname full match))))))
-	  (if (<= (string-to-int emacs-version) 18)
+	  (if (<= (string-to-number emacs-version) 18)
 	      (list 'if nosort
 		    'files
 		    '(require (quote sort))
@@ -1130,12 +1130,12 @@
     (goto-char (point-min))
     (or (re-search-forward "_width[\t ]+\\([0-9]+\\)" nil t)
 	(x-face-error "!! Illegal xbm file format." (current-buffer)))
-    (setq width (string-to-int (match-string 1))
+    (setq width (string-to-number (match-string 1))
 	  xbytes (/ (+ width 7) 8))
     (goto-char (point-min))
     (or (re-search-forward "_height[\t ]+\\([0-9]+\\)" nil t)
 	(x-face-error "!! Illegal xbm file format." (current-buffer)))
-    (setq height (string-to-int (match-string 1)))
+    (setq height (string-to-number (match-string 1)))
 
     (goto-char (point-min))
     (re-search-forward "0x[0-9a-f][0-9a-f],")
@@ -1347,8 +1347,8 @@
 		(setq animate (and (numberp animate) (max animate 0.05)))
 		(goto-char beg)
 		(setq geometry (and (re-search-forward re2 end t)
-				    (list (string-to-int (match-string 1))
-					  (string-to-int (match-string 2))))
+				    (list (string-to-number (match-string 1))
+					  (string-to-number (match-string 2))))
 		      num (apply '* (if rgb 3 (if gray depth 1)) geometry))
 		(or (and image
 			 (prog1
@@ -1968,7 +1968,7 @@
 				(lambda (str)
 				  (if (and (string-match re str)
 					   (setq str (match-string 1 str)))
-				      (- (string-to-int str))
+				      (- (string-to-number str))
 				    0)))
 			       exists) '>))))
     (save-excursion
@@ -2258,7 +2258,7 @@
 (defun x-face-menu-encode ()
   "Generate X-Face string(s) from xbm file using menu."
   (interactive)
-  (and (> (string-to-int emacs-version) 18)
+  (and (> (string-to-number emacs-version) 18)
        (let ((minibuffer-setup-hook minibuffer-setup-hook)
 	     x-face-default-xbm-file completions)
 	 (add-hook 'minibuffer-setup-hook 'x-face-minibuffer-completion-help)
@@ -2386,7 +2386,7 @@
 (defun x-face-menu-insert ()
   "Insert an X-Face using menu."
   (interactive)
-  (and (> (string-to-int emacs-version) 18)
+  (and (> (string-to-number emacs-version) 18)
        (let ((minibuffer-setup-hook minibuffer-setup-hook)
 	     (winconf (current-window-configuration))
 	     x-face-default-xbm-file)
@@ -2745,7 +2745,7 @@
 
 ;;; Menu.
 (and (not (featurep 'xemacs))
-     (> (string-to-int emacs-version) 18)
+     (> (string-to-number emacs-version) 18)
      (progn
 
        (defconst x-face-menu-title "X-Face")