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

org-table.el: Handle localized time-stamps in formulas evaluation 

* org-table.el (org-table-eval-formula): Handle localized
time-stamps by internally converting them to english during
formulas evaluation.

Thanks to Viktor Rosenfeld for suggesting this.
This commit is contained in:
Bastien Guerry 2012-12-20 01:36:05 +01:00
parent fcd269baa8
commit beeb9168dd
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lisp/org-table.el
View File

@ -2647,8 +2647,18 @@ not overwrite the stored one."
duration-output-format) ev))
(or (fboundp 'calc-eval)
(error "Calc does not seem to be installed, and is needed to evaluate the formula"))
;; "Inactivate" time-stamps so that Calc can handle them
;; Use <...> time-stamps so that Calc can handle them
(setq form (replace-regexp-in-string org-ts-regexp3 "<\\1>" form))
;; I18n-ize local time-stamps by setting (system-time-locale "C")
(when (string-match org-ts-regexp2 form)
(let* ((ts (match-string 0 form))
(tsp (apply 'encode-time (save-match-data (org-parse-time-string ts))))
(system-time-locale "C")
(tf (or (and (save-match-data (string-match "[0-9]\\{1,2\\}:[0-9]\\{2\\}" ts))
(cdr org-time-stamp-formats))
(car org-time-stamp-formats))))
(setq form (replace-match (format-time-string tf tsp) t t form))))
(setq ev (if (and duration (string-match "^[0-9]+:[0-9]+\\(?::[0-9]+\\)?$" form))
form
(calc-eval (cons form org-tbl-calc-modes) (if numbers 'num)))