浏览代码

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

Carsten Dominik 14 年之前
父节点
当前提交
b1f9750fd6
共有 1 个文件被更改,包括 3 次插入2 次删除
  1. 3 2
      lisp/ob-exp.el

+ 3 - 2
lisp/ob-exp.el

@@ -248,8 +248,9 @@ This function is called by `org-babel-exp-do-export'.  The code
 block will be evaluated.  Optional argument SILENT can be used to
 block will be evaluated.  Optional argument SILENT can be used to
 inhibit insertion of results into the buffer."
 inhibit insertion of results into the buffer."
   (when (and org-export-babel-evaluate
   (when (and org-export-babel-evaluate
-	     (not (equal hash (org-babel-exp-in-export-file (nth 0 info)
-				(org-babel-result-hash)))))
+	     (not (and hash
+		       (equal hash (org-babel-exp-in-export-file (nth 0 info)
+				     (org-babel-result-hash))))))
     (let ((lang (nth 0 info))
     (let ((lang (nth 0 info))
 	  (body (nth 1 info)))
 	  (body (nth 1 info)))
       ;; skip code blocks which we can't evaluate
       ;; skip code blocks which we can't evaluate