mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-08-26 03:32:53 +00:00
Merge branch 'master' of orgmode.org:org-mode
This commit is contained in:
commit
e800105122
|
@ -87,7 +87,7 @@ specifying a var of the same value."
|
||||||
(concat "[\n"
|
(concat "[\n"
|
||||||
(mapconcat #'org-babel-perl--var-to-perl var "")
|
(mapconcat #'org-babel-perl--var-to-perl var "")
|
||||||
prefix "]"))
|
prefix "]"))
|
||||||
(concat "q(" (princ var) ")"))
|
(format "q(%s)" var))
|
||||||
(unless (zerop org-babel-perl--lvl) ",\n")))))
|
(unless (zerop org-babel-perl--lvl) ",\n")))))
|
||||||
|
|
||||||
(defvar org-babel-perl-buffers '(:default . nil))
|
(defvar org-babel-perl-buffers '(:default . nil))
|
||||||
|
|
|
@ -2701,6 +2701,7 @@ 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)))
|
||||||
|
@ -2711,10 +2712,6 @@ 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")
|
||||||
|
|
Loading…
Reference in a new issue