diff options
| author | Bastien <bzg@gnu.org> | 2020-02-19 10:56:20 +0100 |
|---|---|---|
| committer | Bastien <bzg@gnu.org> | 2020-02-19 10:56:20 +0100 |
| commit | 4150832d430ac52acbda5d00be4277aea21d3c38 (patch) | |
| tree | abd00fdc2cd2373681494702a5fbdff4835d5149 | |
| parent | 09877e5be23dc845998134fe3120061e8ef0c98c (diff) | |
| parent | f90642e82838c7fea99781a0977fd6fa26aceee1 (diff) | |
| download | org-mode-4150832d430ac52acbda5d00be4277aea21d3c38.tar.gz | |
Merge branch 'maint'
| -rw-r--r-- | lisp/ob-core.el | 7 | ||||
| -rw-r--r-- | testing/lisp/test-ob.el | 18 |
2 files changed, 14 insertions, 11 deletions
diff --git a/lisp/ob-core.el b/lisp/ob-core.el index 13a83ef..fb23c2f 100644 --- a/lisp/ob-core.el +++ b/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. diff --git a/testing/lisp/test-ob.el b/testing/lisp/test-ob.el index 681f340..97e1b49 100644 --- a/testing/lisp/test-ob.el +++ b/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) |