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

Work around calc-eval regression

Browse source 
* 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.
This commit is contained in:
Carsten Dominik 2013-03-25 11:48:21 +01:00
parent 73fe0ab77a
commit 10e239f434
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
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")