aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Wiegley2003-11-14 11:01:26 +0000
committerJohn Wiegley2003-11-14 11:01:26 +0000
commit175acc2dec010dc5edc0321cc14bad086d785082 (patch)
tree3e119f82e43d7a9a817919fe129d5058a43b2bec
parent746a9754a0272c2c0512ff408322eb62e64a7e44 (diff)
downloademacs-175acc2dec010dc5edc0321cc14bad086d785082.tar.gz
emacs-175acc2dec010dc5edc0321cc14bad086d785082.zip
(eshell-lisp-command): Do not late-convert string arguments to numbers
unless the whole argument was seen as a number.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/eshell/esh-cmd.el3
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 74e9cbf75d4..652fbb5813b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
12003-11-14 John Wiegley <johnw@newartisans.com> 12003-11-14 John Wiegley <johnw@newartisans.com>
2 2
3 * eshell/esh-var.el (eshell-parse-variable-ref): Added a backslash
4 that was optional, but obviously missing based on surrounding
5 code.
6
3 * eshell/esh-cmd.el (eshell-lisp-command): Do not late-convert 7 * eshell/esh-cmd.el (eshell-lisp-command): Do not late-convert
4 string arguments to numbers unless the whole argument was seen as 8 string arguments to numbers unless the whole argument was seen as
5 a number. 9 a number.
diff --git a/lisp/eshell/esh-cmd.el b/lisp/eshell/esh-cmd.el
index 54f4d6c7739..e944020b1ed 100644
--- a/lisp/eshell/esh-cmd.el
+++ b/lisp/eshell/esh-cmd.el
@@ -1400,7 +1400,8 @@ messages, and errors."
1400 (let ((arg (car args))) 1400 (let ((arg (car args)))
1401 (if (and (stringp arg) 1401 (if (and (stringp arg)
1402 (> (length arg) 0) 1402 (> (length arg) 0)
1403 (get-text-property 0 'number arg)) 1403 (not (text-property-not-all
1404 0 (length arg) 'number t arg)))
1404 (setcar args (string-to-number arg)))) 1405 (setcar args (string-to-number arg))))
1405 (setq args (cdr args)))) 1406 (setq args (cdr args))))
1406 (eshell-apply object eshell-last-arguments)) 1407 (eshell-apply object eshell-last-arguments))