Merge branch 'maint'

lisp/ob-core.el

@@ -2926,9 +2926,10 @@ situations in which is it not appropriate."
 (defun org-babel--string-to-number (string)
   "If STRING represents a number return its value.
 Otherwise return nil."
-  (let ((interned-string (ignore-errors (read string))))
-    (when (numberp interned-string)
-      interned-string)))
+  (unless (string-match-p "\\s-" (org-trim string))
+    (let ((interned-string (ignore-errors (read string))))
+      (when (numberp interned-string)
+	interned-string))))
 
 (defun org-babel-import-elisp-from-file (file-name &optional separator)
   "Read the results located at FILE-NAME into an elisp table.

testing/lisp/test-ob.el

@@ -2120,14 +2120,16 @@ abc
 	  (org-babel-execute-src-block))))))
 
 (ert-deftest test-ob/string-to-number ()
-    (should (=  0   (org-babel--string-to-number "0")))
-    (should (=  1   (org-babel--string-to-number "1")))
-    (should (eq nil (org-babel--string-to-number "000")))
-    (should (eq nil (org-babel--string-to-number "001")))
-    (should (eq nil (org-babel--string-to-number "010")))
-    (should (=  100 (org-babel--string-to-number "100")))
-    (should (=  0.1 (org-babel--string-to-number "0.1")))
-    (should (=  1.0 (org-babel--string-to-number "1.0"))))
+    (should (=  0      (org-babel--string-to-number "0")))
+    (should (=  1      (org-babel--string-to-number "1")))
+    (should (eq nil    (org-babel--string-to-number "1 2")))
+    (should (=  1000.0 (org-babel--string-to-number "1e3")))
+    (should (eq 0      (org-babel--string-to-number "000")))
+    (should (eq 1      (org-babel--string-to-number "001")))
+    (should (eq 10     (org-babel--string-to-number "010")))
+    (should (=  100    (org-babel--string-to-number "100")))
+    (should (=  0.1    (org-babel--string-to-number "0.1")))
+    (should (=  1.0    (org-babel--string-to-number "1.0"))))
 
 (provide 'test-ob)