yogsototh/org-mode
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'maint'

Browse source
This commit is contained in:
Bastien 2020-02-19 10:56:20 +01:00
commit 4150832d43
2 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lisp/ob-core.el
View file

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

8
testing/lisp/test-ob.el
View file

@ -2122,9 +2122,11 @@ abc
(ert-deftest test-ob/string-to-number () (ert-deftest test-ob/string-to-number ()
(should (= 0 (org-babel--string-to-number "0"))) (should (= 0 (org-babel--string-to-number "0")))
(should (= 1 (org-babel--string-to-number "1"))) (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 "1 2")))
(should (eq nil (org-babel--string-to-number "001"))) (should (= 1000.0 (org-babel--string-to-number "1e3")))
(should (eq nil (org-babel--string-to-number "010"))) (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 (= 100 (org-babel--string-to-number "100")))
(should (= 0.1 (org-babel--string-to-number "0.1"))) (should (= 0.1 (org-babel--string-to-number "0.1")))
(should (= 1.0 (org-babel--string-to-number "1.0")))) (should (= 1.0 (org-babel--string-to-number "1.0"))))