summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2011-08-14 20:24:43 +0200
committerBastien Guerry <bzg@altern.org>2011-08-14 20:24:43 +0200
commit258aad0b9a428cec9195b22063e42df77dee19c2 (patch)
tree23a2ebaaf7bd1de7e70c6086887abb2aebb477bd
parent4b423ac3cb6ae06e5be649e8a4b6c75bfb9f5c12 (diff)
downloadorg-mode-258aad0b9a428cec9195b22063e42df77dee19c2.tar.gz
org-table.el: Fix missing variables in let constructs.
* org-table.el (org-table-eval-formula): Fix missing variable in let construct. (org-table-time-string-to-seconds): Fix missing variable in let construct. Thanks to John Wiegley for pointing at this.
-rw-r--r--lisp/org-table.el5
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/org-table.el b/lisp/org-table.el
index 82d1e13..36e032d 100644
--- a/lisp/org-table.el
+++ b/lisp/org-table.el
@@ -2409,7 +2409,8 @@ not overwrite the stored one."
(modes (copy-sequence org-calc-default-modes))
(numbers nil) ; was a variable, now fixed default
(keep-empty nil)
- n form form0 formrpl formrg bw fmt x ev orig c lispp literal duration)
+ n form form0 formrpl formrg bw fmt x ev orig c lispp literal
+ duration duration-output-format)
;; Parse the format string. Since we have a lot of modes, this is
;; a lot of work. However, I think calc still uses most of the time.
(if (string-match ";" formula)
@@ -3242,7 +3243,7 @@ For example: 28 -> AB."
"Convert a time string into numerical duration in seconds.
S can be a string matching either -?HH:MM:SS or -?HH:MM.
If S is a string representing a number, keep this number."
- (let (hour min sec res)
+ (let (hour minus min sec res)
(cond
((and (string-match "\\(-?\\)\\([0-9]+\\):\\([0-9]+\\):\\([0-9]+\\)" s))
(setq minus (< 0 (length (match-string 1 s)))