From 13d670744e902abb6fdc85cd7652071c84c41c83 Mon Sep 17 00:00:00 2001 From: Dan Davison Date: Mon, 2 Nov 2009 00:29:26 -0500 Subject: [PATCH 1/2] org-babel: set case-fold-search t when reading results --- contrib/babel/lisp/org-babel.el | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/contrib/babel/lisp/org-babel.el b/contrib/babel/lisp/org-babel.el index 807808ea3..628c34a5c 100644 --- a/contrib/babel/lisp/org-babel.el +++ b/contrib/babel/lisp/org-babel.el @@ -503,21 +503,22 @@ line. If no result exists for this block then create a (defun org-babel-read-result () "Read the result at `point' into emacs-lisp." - (cond - ((org-at-table-p) (org-babel-read-table)) - ((looking-at ": ") - (let ((result-string - (org-babel-trim - (mapconcat (lambda (line) (if (and (> (length line) 1) - (string= ": " (substring line 0 2))) - (substring line 2) - line)) - (split-string - (buffer-substring (point) (org-babel-result-end)) "[\r\n]+") - "\n")))) - (or (org-babel-number-p result-string) result-string))) - ((looking-at "^#\\+RESNAME:") - (save-excursion (forward-line 1) (org-babel-read-result))))) + (let ((case-fold-search t) result-string) + (cond + ((org-at-table-p) (org-babel-read-table)) + ((looking-at ": ") + (setq result-string + (org-babel-trim + (mapconcat (lambda (line) (if (and (> (length line) 1) + (string= ": " (substring line 0 2))) + (substring line 2) + line)) + (split-string + (buffer-substring (point) (org-babel-result-end)) "[\r\n]+") + "\n"))) + (or (org-babel-number-p result-string) result-string)) + ((looking-at "^#\\+RESNAME:") + (save-excursion (forward-line 1) (org-babel-read-result)))))) (defun org-babel-read-table () "Read the table at `point' into emacs-lisp." From f01fb927e10210c302f15c8189af3e65c0743a85 Mon Sep 17 00:00:00 2001 From: Dan Davison Date: Mon, 2 Nov 2009 00:48:44 -0500 Subject: [PATCH 2/2] org-babel: read results contained in generic org blocks --- contrib/babel/lisp/org-babel.el | 1 + 1 file changed, 1 insertion(+) diff --git a/contrib/babel/lisp/org-babel.el b/contrib/babel/lisp/org-babel.el index 628c34a5c..90ac447eb 100644 --- a/contrib/babel/lisp/org-babel.el +++ b/contrib/babel/lisp/org-babel.el @@ -506,6 +506,7 @@ line. If no result exists for this block then create a (let ((case-fold-search t) result-string) (cond ((org-at-table-p) (org-babel-read-table)) + ((looking-at org-block-regexp) (org-babel-trim (match-string 4))) ((looking-at ": ") (setq result-string (org-babel-trim