Merge from emacs-24; up to 2012-12-27T08:21:08Z!rgm@gnu.org

3 files changed, 13 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b8c0f629042..340dc41a744 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,16 @@
 2013-04-26  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-26  Erik Charlebois  <erikcharlebois@gmail.com>
+
+        * emacs-lisp/syntax.el (syntax-propertize-multiline):
+        Use `syntax-multiline' text property consistently instead of
+        `font-lock-multiline'. (bug#14237).
+
+2013-04-26  Glenn Morris  <rgm@gnu.org>
+
         * emacs-lisp/shadow.el (list-load-path-shadows):
         No longer necessary to check for duplicate simple.el, since
         2012-07-07 change to init_lread to not include installation lisp
diff --git a/lisp/emacs-lisp/syntax.el b/lisp/emacs-lisp/syntax.el
index bf2c8308bb5..0a4758a9ccd 100644
--- a/lisp/emacs-lisp/syntax.el
+++ b/lisp/emacs-lisp/syntax.el
@@ -99,7 +99,7 @@ Put first the functions more likely to cause a change and cheaper to compute.")
     (setq beg (or (previous-single-property-change beg 'syntax-multiline)
                   (point-min))))
   ;;
-  (when (get-text-property end 'font-lock-multiline)
+  (when (get-text-property end 'syntax-multiline)
     (setq end (or (text-property-any end (point-max)
                                      'syntax-multiline nil)
                   (point-max))))
diff --git a/lisp/subr.el b/lisp/subr.el
index 7fe3d411580..523bec59b29 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -2225,7 +2225,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.")