ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

org-table.el: Fix bug in formula duration computation.

This commit is contained in:
Maciek Starzyk 2011-07-04 10:51:29 +02:00 committed by Bastien Guerry
parent 71eff05694
commit 429b1cc81a
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)))) (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))))) (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*"