tec/org-mode
tec
/
org-mode
forked from mirrors/org-mode
1
0
Fork 0
Code Pull Requests Releases Activity

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:
Eric S Fraga 2011-07-04 12:23:25 +02:00 committed by Bastien Guerry
parent b9af1d0cd5
commit 9f056593a5
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lisp/org-table.el
View File

@ -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*"