mirrors/org-mode
0
0
Fork 1
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-07-16 21:46:26 +00:00
Code Releases Activity

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

Browse source
This commit is contained in:
Bastien Guerry 2013-03-25 15:54:42 +01:00
parent ce8706f268 181abcaf29
commit e800105122
2 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lisp/ob-perl.el
View file

@ -87,7 +87,7 @@ specifying a var of the same value."
(concat "[\n"
(mapconcat #'org-babel-perl--var-to-perl var "")
prefix "]"))
(concat "q(" (princ var) ")"))
(format "q(%s)" var))
(unless (zerop org-babel-perl--lvl) ",\n")))))
(defvar org-babel-perl-buffers '(:default . nil))

5
lisp/org-table.el
View file

@ -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")