lisp/loadup.el: Use `string-to-number', not `string-to-int'.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3449a0ada9c79246e3df52ec85ccc3cd842a3534..9b162f94a6d16db15f507ccb3103513c87ec4164 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2011-04-15  Juanma Barranquero  <lekktu@gmail.com>
+
+       * loadup.el: Use `string-to-number', not `string-to-int'.
+
 2011-04-15  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * progmodes/gud.el (gud-gdb): Use completion-at-point instead of
@@ -8,11 +12,10 @@
 
 2011-04-14  Michael Albinus  <michael.albinus@gmx.de>
 
-       * net/tramp-sh.el (tramp-sh-handle-file-attributes): Handle the
-       case when the scripts fail.  Use `tramp-do-file-attributes-with-ls'
-       then.
-       (tramp-do-copy-or-rename-file-out-of-band): Do not check any
-       longer, whether`executable-find' is bound.
+       * net/tramp-sh.el (tramp-sh-handle-file-attributes): Handle the case
+       when the scripts fail.  Use `tramp-do-file-attributes-with-ls' then.
+       (tramp-do-copy-or-rename-file-out-of-band): Do not check any longer
+       whether `executable-find' is bound.
 
        * net/tramp-smb.el (tramp-smb-handle-copy-file): Fix docstring.
 

diff --git a/lisp/loadup.el b/lisp/loadup.el
index 8a11a6e3e06fd576d5927bc59ac72f6680763cd8..d348456ae32b889d754d78f013ca304e38dd4eee 100644 (file)
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -263,7 +263,7 @@
     (let* ((base (concat "emacs-" emacs-version "."))
           (files (file-name-all-completions base default-directory))
           (versions (mapcar (function (lambda (name)
-                                        (string-to-int (substring name (length base)))))
+                                        (string-to-number (substring name (length base)))))
                             files)))
       ;; `emacs-version' is a constant, so we shouldn't change it with `setq'.
       (defconst emacs-version