From e66ba1dfc4cf2e12100191d2c24436c42d097268 Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Tue, 3 Jan 2012 18:27:21 +0100 Subject: Merge Org 7.8.03 --- lisp/org/ob-calc.el | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'lisp/org/ob-calc.el') diff --git a/lisp/org/ob-calc.el b/lisp/org/ob-calc.el index 68694786729..0b0cfd4b1ed 100644 --- a/lisp/org/ob-calc.el +++ b/lisp/org/ob-calc.el @@ -5,7 +5,6 @@ ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research ;; Homepage: http://orgmode.org -;; Version: 7.7 ;; This file is part of GNU Emacs. @@ -29,10 +28,15 @@ ;;; Code: (require 'ob) (require 'calc) -(require 'calc-store) -(unless (featurep 'xemacs) (require 'calc-trail)) +(unless (featurep 'xemacs) + (require 'calc-trail) + (require 'calc-store)) (eval-when-compile (require 'ob-comint)) +(declare-function calc-store-into "calc-store" (&optional var)) +(declare-function calc-recall "calc-store" (&optional var)) +(declare-function math-evaluate-expr "calc-ext" (x)) + (defvar org-babel-default-header-args:calc nil "Default arguments for evaluating an calc source block.") -- cgit v1.2.3