diff options
| author | Carsten Dominik <carsten.dominik@gmail.com> | 2013-03-25 15:48:56 +0100 |
|---|---|---|
| committer | Carsten Dominik <carsten.dominik@gmail.com> | 2013-03-25 15:48:56 +0100 |
| commit | 21fead7888c3842c2fc80d6feb8eb09c475450e5 (patch) | |
| tree | 9aa1b9cb3e925e1481b67584173c5720c8a19f6e | |
| parent | 9ae225f48aee2dafa8a053a752a188d40d678213 (diff) | |
| download | org-mode-21fead7888c3842c2fc80d6feb8eb09c475450e5.tar.gz | |
Revert "Work around calc-eval regression"
This reverts commit 10e239f434e63ce5e0b4b242911357536dad98fe.
| -rw-r--r-- | lisp/org-table.el | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/lisp/org-table.el b/lisp/org-table.el index 86d3f76..f087cf7 100644 --- a/lisp/org-table.el +++ b/lisp/org-table.el @@ -2701,6 +2701,7 @@ 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))) @@ -2711,10 +2712,6 @@ 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") |