* subr.el (read-number): Once more use `read'

rather than `string-to-number', to trap non-numeric input.

Fixes: debbugs:14254

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b1baa9d9e640f660ddbc0eb072d9a81abfe52094..2e0645e5156936e8a7d073872357b7cd931acf03 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-04-24  Glenn Morris  <rgm@gnu.org>
+
+       * subr.el (read-number): Once more use `read' rather than
+       `string-to-number', to trap non-numeric input.  (Bug#14254)
+
 2013-04-22  Erik Charlebois  <erikcharlebois@gmail.com>
 
        * emacs-lisp/syntax.el (syntax-propertize-multiline):

diff --git a/lisp/subr.el b/lisp/subr.el
index eef8c46c7d61bf8914296eac1c942e247c077ff0..88f27c7576409e71b10bcc7fad78071a62ce6f34 100644 (file)
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -2229,7 +2229,7 @@ The value of DEFAULT is inserted into PROMPT."
            (condition-case nil
                (setq n (cond
                         ((zerop (length str)) default1)
-                        ((stringp str) (string-to-number str))))
+                        ((stringp str) (read str))))
              (error nil)))
          (unless (numberp n)
            (message "Please enter a number.")