summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Schulte <schulte.eric@gmail.com>2011-07-18 17:08:37 -0600
committerEric Schulte <schulte.eric@gmail.com>2011-07-18 17:08:37 -0600
commit8854497c354b10188ad9be408ed7291d299140c1 (patch)
tree4cfaead31b7a546149809726609d404ba34a2ee0
parent58763f36e3e87fb6ee06e9063f7545855b25598b (diff)
downloadorg-mode-8854497c354b10188ad9be408ed7291d299140c1.tar.gz
ob-exp: on export resolve hashes in the current (not original) file buffer
* lisp/ob-exp.el (org-babel-exp-results): Resolve hashes in the current (not original) file buffer. * lisp/ob.el (org-babel-current-result-hash): More informative name, and remove useless optional argument.
-rw-r--r--lisp/ob-exp.el4
-rw-r--r--lisp/ob.el4
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
diff --git a/lisp/ob.el b/lisp/ob.el
index c554fe1..4f61995 100644
--- a/lisp/ob.el
+++ b/lisp/ob.el
@@ -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 ()