diff options
| author | Carsten Dominik <carsten.dominik@gmail.com> | 2013-03-25 11:48:21 +0100 |
|---|---|---|
| committer | Carsten Dominik <carsten.dominik@gmail.com> | 2013-03-25 11:48:21 +0100 |
| commit | 10e239f434e63ce5e0b4b242911357536dad98fe (patch) | |
| tree | 5eb9b34611ce8ec60c207d4e21853ebe5deff809 | |
| parent | 73fe0ab77aa61ca0244674ba1d49c835b258a09e (diff) | |
| download | org-mode-10e239f434e63ce5e0b4b242911357536dad98fe.tar.gz | |
Work around calc-eval regression
* lisp/org-table.el (org-table-eval-formula): Work-around for
calc-eval regression.
Calc-eval can no longer be called without initializing the
*Calculator* buffer first.
| -rw-r--r-- | lisp/org-table.el | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lisp/org-table.el b/lisp/org-table.el index f087cf7..86d3f76 100644 --- a/lisp/org-table.el +++ b/lisp/org-table.el @@ -2701,7 +2701,6 @@ not overwrite the stored one." (org-table-make-reference x keep-empty numbers lispp)) t t form))) - (if lispp (setq ev (condition-case nil (eval (eval (read form))) @@ -2712,6 +2711,10 @@ not overwrite the stored one." duration-output-format) ev)) (or (fboundp 'calc-eval) (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 (setq form (replace-regexp-in-string org-ts-regexp3 "<\\1>" form)) ;; I18n-ize local time-stamps by setting (system-time-locale "C") |