diff options
author | Bastien Guerry <bzg@altern.org> | 2011-07-19 01:25:47 +0200 |
---|---|---|
committer | Bastien Guerry <bzg@altern.org> | 2011-07-19 01:25:47 +0200 |
commit | 0df11d910c848bf05695584db7df32043b808326 (patch) | |
tree | 83100c8dee524b718738f3a6d9f684a81caf7778 | |
parent | a90b876b936820f6a80cc2ffa807bc29a9de73eb (diff) | |
parent | 8854497c354b10188ad9be408ed7291d299140c1 (diff) | |
download | org-mode-0df11d910c848bf05695584db7df32043b808326.tar.gz |
Merge branch 'master' of orgmode.org:org-mode
-rw-r--r-- | lisp/ob-exp.el | 4 | ||||
-rw-r--r-- | lisp/ob.el | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/lisp/ob-exp.el b/lisp/ob-exp.el index 448eaed..1fc6524 100644 --- a/lisp/ob-exp.el +++ b/lisp/ob-exp.el @@ -243,9 +243,7 @@ This function is called by `org-babel-exp-do-export'. The code block will be evaluated. Optional argument SILENT can be used to inhibit insertion of results into the buffer." (when (and org-export-babel-evaluate - (not (and hash - (equal hash (org-babel-exp-in-export-file (nth 0 info) - (org-babel-result-hash info)))))) + (not (and hash (equal hash (org-babel-current-result-hash))))) (let ((lang (nth 0 info)) (body (nth 1 info))) ;; skip code blocks which we can't evaluate @@ -782,9 +782,9 @@ the current subtree." (nth 1 info)))) (sha1 it)))))) -(defun org-babel-result-hash (&optional info) +(defun org-babel-current-result-hash () "Return the in-buffer hash associated with INFO." - (org-babel-where-is-src-block-result nil info) + (org-babel-where-is-src-block-result) (org-babel-clean-text-properties (match-string 3))) (defun org-babel-hide-hash () |