summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric S Fraga <e.fraga@ucl.ac.uk>2011-07-04 12:23:25 +0200
committerBastien Guerry <bzg@altern.org>2011-07-04 12:23:25 +0200
commit9f056593a5031c1ccf0a591aceedf7558a9847fa (patch)
tree59f7538a12edcf9e1e78034dfa06136465d819ba
parentb9af1d0cd518f5617103100545868a9b42e97b76 (diff)
downloadorg-mode-9f056593a5031c1ccf0a591aceedf7558a9847fa.tar.gz
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 :)
-rw-r--r--lisp/org-table.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/org-table.el b/lisp/org-table.el
index 7f0f9bb..9724dc2 100644
--- a/lisp/org-table.el
+++ b/lisp/org-table.el
@@ -2513,13 +2513,13 @@ not overwrite the stored one."
(error "#ERROR"))
ev (if (numberp ev) (number-to-string ev) ev)
ev (if duration (org-table-time-seconds-to-string
- (string-to-number ev) ev)))
+ (string-to-number ev)) ev))
(or (fboundp 'calc-eval)
(error "Calc does not seem to be installed, and is needed to evaluate the formula"))
(setq ev (calc-eval (cons form modes)
(if numbers 'num))
ev (if duration (org-table-time-seconds-to-string
- (string-to-number ev) ev))))
+ (string-to-number ev)) ev)))
(when org-table-formula-debug
(with-output-to-temp-buffer "*Substitution History*"