Explorar o código

Merge branch 'maint'

Bastien %!s(int64=5) %!d(string=hai) anos
pai
achega
09877e5be2
Modificáronse 1 ficheiros con 3 adicións e 2 borrados
  1. 3 2
      lisp/ob-core.el

+ 3 - 2
lisp/ob-core.el

@@ -2926,8 +2926,9 @@ 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."
-  (and (string-match-p "\\`-?\\([0-9]\\|\\([1-9]\\|[0-9]*\\.\\)[0-9]*\\)\\'" string)
-       (string-to-number 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.