summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Andresen <benny@in-ulm.de>2011-07-09 17:47:41 +0200
committerBastien Guerry <bzg@altern.org>2011-07-09 17:47:41 +0200
commita493b4d489e8f6141a855e3db8ecc13bb63d39ac (patch)
tree0d34283a1d153c744cd052629d3e79dc21bafdbb
parentf65e63d09420ffe19bbbd7652fe9f67ef213432c (diff)
downloadorg-mode-a493b4d489e8f6141a855e3db8ecc13bb63d39ac.tar.gz
Fix calc-eval date(<timestamp>)
-rw-r--r--lisp/org-table.el1
1 files changed, 1 insertions, 0 deletions
diff --git a/lisp/org-table.el b/lisp/org-table.el
index fcb6e9e..23118cc 100644
--- a/lisp/org-table.el
+++ b/lisp/org-table.el
@@ -3213,6 +3213,7 @@ For example: 28 -> AB."
(sec (string-to-number (match-string 3 s))))
(+ (* hour 3600) (* min 60) sec)))
((and (stringp s)
+ (not (string-match org-ts-regexp-both s))
(string-match "\\([0-9]+\\):\\([0-9]+\\)" s))
(let ((min (string-to-number (match-string 1 s)))
(sec (string-to-number (match-string 2 s))))