mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-08-23 10:49:48 +00:00
org-table.el: Er... fix the previous fix about time formulas computation.
The error was introduced by Bastien, not Maciek Starzyk. Bzg was trying to fix things manually too hastily :)
This commit is contained in:
parent
b9af1d0cd5
commit
9f056593a5
|
@ -2513,13 +2513,13 @@ not overwrite the stored one."
|
||||||
(error "#ERROR"))
|
(error "#ERROR"))
|
||||||
ev (if (numberp ev) (number-to-string ev) ev)
|
ev (if (numberp ev) (number-to-string ev) ev)
|
||||||
ev (if duration (org-table-time-seconds-to-string
|
ev (if duration (org-table-time-seconds-to-string
|
||||||
(string-to-number ev) ev)))
|
(string-to-number ev)) ev))
|
||||||
(or (fboundp 'calc-eval)
|
(or (fboundp 'calc-eval)
|
||||||
(error "Calc does not seem to be installed, and is needed to evaluate the formula"))
|
(error "Calc does not seem to be installed, and is needed to evaluate the formula"))
|
||||||
(setq ev (calc-eval (cons form modes)
|
(setq ev (calc-eval (cons form modes)
|
||||||
(if numbers 'num))
|
(if numbers 'num))
|
||||||
ev (if duration (org-table-time-seconds-to-string
|
ev (if duration (org-table-time-seconds-to-string
|
||||||
(string-to-number ev) ev))))
|
(string-to-number ev)) ev)))
|
||||||
|
|
||||||
(when org-table-formula-debug
|
(when org-table-formula-debug
|
||||||
(with-output-to-temp-buffer "*Substitution History*"
|
(with-output-to-temp-buffer "*Substitution History*"
|
||||||
|
|
Loading…
Reference in a new issue