aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2011-04-15 05:15:22 +0200
committerJuanma Barranquero2011-04-15 05:15:22 +0200
commit49093f601b69d91126aefd328ee8f6bfeb797407 (patch)
tree3588c120df13eb85d669644f58ec4a1fbe4e1e83
parentcc39a9dba6e3633e67501eaf0361fb2f040cb064 (diff)
downloademacs-49093f601b69d91126aefd328ee8f6bfeb797407.tar.gz
emacs-49093f601b69d91126aefd328ee8f6bfeb797407.zip
lisp/loadup.el: Use `string-to-number', not `string-to-int'.
-rw-r--r--lisp/ChangeLog13
-rw-r--r--lisp/loadup.el2
2 files changed, 9 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3449a0ada9c..9b162f94a6d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12011-04-15 Juanma Barranquero <lekktu@gmail.com>
2
3 * loadup.el: Use `string-to-number', not `string-to-int'.
4
12011-04-15 Stefan Monnier <monnier@iro.umontreal.ca> 52011-04-15 Stefan Monnier <monnier@iro.umontreal.ca>
2 6
3 * progmodes/gud.el (gud-gdb): Use completion-at-point instead of 7 * progmodes/gud.el (gud-gdb): Use completion-at-point instead of
@@ -8,11 +12,10 @@
8 12
92011-04-14 Michael Albinus <michael.albinus@gmx.de> 132011-04-14 Michael Albinus <michael.albinus@gmx.de>
10 14
11 * net/tramp-sh.el (tramp-sh-handle-file-attributes): Handle the 15 * net/tramp-sh.el (tramp-sh-handle-file-attributes): Handle the case
12 case when the scripts fail. Use `tramp-do-file-attributes-with-ls' 16 when the scripts fail. Use `tramp-do-file-attributes-with-ls' then.
13 then. 17 (tramp-do-copy-or-rename-file-out-of-band): Do not check any longer
14 (tramp-do-copy-or-rename-file-out-of-band): Do not check any 18 whether `executable-find' is bound.
15 longer, whether`executable-find' is bound.
16 19
17 * net/tramp-smb.el (tramp-smb-handle-copy-file): Fix docstring. 20 * net/tramp-smb.el (tramp-smb-handle-copy-file): Fix docstring.
18 21
diff --git a/lisp/loadup.el b/lisp/loadup.el
index 8a11a6e3e06..d348456ae32 100644
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -263,7 +263,7 @@
263 (let* ((base (concat "emacs-" emacs-version ".")) 263 (let* ((base (concat "emacs-" emacs-version "."))
264 (files (file-name-all-completions base default-directory)) 264 (files (file-name-all-completions base default-directory))
265 (versions (mapcar (function (lambda (name) 265 (versions (mapcar (function (lambda (name)
266 (string-to-int (substring name (length base))))) 266 (string-to-number (substring name (length base)))))
267 files))) 267 files)))
268 ;; `emacs-version' is a constant, so we shouldn't change it with `setq'. 268 ;; `emacs-version' is a constant, so we shouldn't change it with `setq'.
269 (defconst emacs-version 269 (defconst emacs-version