diff options
| author | Bastien Guerry <bastien1@free.fr> | 2012-01-03 18:27:21 +0100 |
|---|---|---|
| committer | Bastien Guerry <bastien1@free.fr> | 2012-01-03 18:27:21 +0100 |
| commit | e66ba1dfc4cf2e12100191d2c24436c42d097268 (patch) | |
| tree | b50b009e703fe1a9e8cb13cddf7928a97ad6210c /lisp/org/ob-calc.el | |
| parent | 88c5c7c8313162b94173fd4333e6062aa07c4d2e (diff) | |
| download | emacs-e66ba1dfc4cf2e12100191d2c24436c42d097268.tar.gz emacs-e66ba1dfc4cf2e12100191d2c24436c42d097268.tar.bz2 emacs-e66ba1dfc4cf2e12100191d2c24436c42d097268.zip | |
Merge Org 7.8.03
Diffstat (limited to 'lisp/org/ob-calc.el')
| -rw-r--r-- | lisp/org/ob-calc.el | 10 |
1 files changed, 7 insertions, 3 deletions
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.") |