0
0
Fork 1
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-08-24 21:02:51 +00:00

Merge branch 'master' of orgmode.org:org-mode

This commit is contained in:
Bastien Guerry 2011-07-19 01:25:47 +02:00
commit 0df11d910c
2 changed files with 3 additions and 5 deletions

View file

@ -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

View file

@ -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 ()