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

Merge branch 'master' of orgmode.org:org-mode

This commit is contained in:
Bastien Guerry 2013-03-25 12:17:25 +01:00
parent 44b218d2d7 acff82f9fe
commit 9ae225f48a
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lisp/org-table.el
View File

@ -2701,7 +2701,6 @@ not overwrite the stored one."
(org-table-make-reference (org-table-make-reference
x keep-empty numbers lispp)) x keep-empty numbers lispp))
t t form))) t t form)))
(if lispp (if lispp
(setq ev (condition-case nil (setq ev (condition-case nil
(eval (eval (read form))) (eval (eval (read form)))
@ -2712,6 +2711,10 @@ not overwrite the stored one."
duration-output-format) ev)) duration-output-format) ev))
(or (fboundp 'calc-eval) (or (fboundp 'calc-eval)
(user-error "Calc does not seem to be installed, and is needed to evaluate the formula")) (user-error "Calc does not seem to be installed, and is needed to evaluate the formula"))
(or (get-buffer "*Calculator*")
(progn
(require 'calc)
(save-window-excursion (calc))))
;; Use <...> 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)) (setq form (replace-regexp-in-string org-ts-regexp3 "<\\1>" form))
;; I18n-ize local time-stamps by setting (system-time-locale "C") ;; I18n-ize local time-stamps by setting (system-time-locale "C")