summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Schulte <schulte.eric@gmail.com>2009-11-18 14:54:12 -0700
committerEric Schulte <schulte.eric@gmail.com>2009-11-20 10:43:06 -0700
commit45cce0240235e5c524c5ce49f07bf94aae3bed18 (patch)
treeb4ae46612988e604e225804ecdb0d42d5e2f39bf
parent2f05cf41fff897c9ef00b2cb8430dd58c98ca7c4 (diff)
downloadorg-mode-45cce0240235e5c524c5ce49f07bf94aae3bed18.tar.gz
org-babel: caching bugfixes
- the match-string was thrown off by an earlier commit - now sorting the parameters to ensure consistent order when - generating hashes
-rw-r--r--contrib/babel/lisp/org-babel.el7
1 files changed, 5 insertions, 2 deletions
diff --git a/contrib/babel/lisp/org-babel.el b/contrib/babel/lisp/org-babel.el
index 6d27428..3548bc0 100644
--- a/contrib/babel/lisp/org-babel.el
+++ b/contrib/babel/lisp/org-babel.el
@@ -191,7 +191,10 @@ block."
;; (message "supplied params=%S" params) ;; debugging
(let* ((info (or info (org-babel-get-src-block-info)))
(lang (first info))
- (params (setf (third info) (org-babel-merge-params (third info) params)))
+ (params (setf (third info)
+ (sort (org-babel-merge-params (third info) params)
+ (lambda (el1 el2) (string< (symbol-name (car el1))
+ (symbol-name (car el2)))))))
(new-hash (unless (assoc :nocache params) (org-babel-sha1-hash info)))
(old-hash (org-babel-result-hash info))
(body (setf (second info)
@@ -353,7 +356,7 @@ added to the header-arguments-alist."
(defun org-babel-result-hash (&optional info)
(org-babel-where-is-src-block-result nil info)
- (org-babel-clean-text-properties (match-string 2)))
+ (org-babel-clean-text-properties (match-string 3)))
(defun org-babel-hide-hash ()
"Hide the hash in the current results line. Only the initial