From 727a22e3270d2ecef5209d22bc1b7ca107e57a2e Mon Sep 17 00:00:00 2001 From: Eric Schulte Date: Sun, 24 Mar 2013 18:25:42 -0600 Subject: [PATCH 1/2] print Perl variables with a format string Don't use princ because it doesn't always return a string. Thanks to Rick Frankel for pointing this out. * lisp/ob-perl.el (org-babel-perl--var-to-perl): Print Perl variables with a format string. --- lisp/ob-perl.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/ob-perl.el b/lisp/ob-perl.el index 8bc84f0b1..117782f35 100644 --- a/lisp/ob-perl.el +++ b/lisp/ob-perl.el @@ -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)) From 21fead7888c3842c2fc80d6feb8eb09c475450e5 Mon Sep 17 00:00:00 2001 From: Carsten Dominik Date: Mon, 25 Mar 2013 15:48:56 +0100 Subject: [PATCH 2/2] Revert "Work around calc-eval regression" This reverts commit 10e239f434e63ce5e0b4b242911357536dad98fe. --- lisp/org-table.el | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/lisp/org-table.el b/lisp/org-table.el index 86d3f7637..f087cf7c4 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")