mirrors
/
org-mode
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git
0
0
Fork 1
Code Releases Activity

ob-ref: fix bug 

* lisp/ob-ref.el (org-babel-ref-resolve): Fix error when src block
result is nil.
This commit is contained in:
Aaron Ecay 2015-11-07 20:09:34 +00:00
parent 3f6e71e62e
commit f0380f54c1
1 changed files with 34 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
lisp/ob-ref.el
View File

@ -162,44 +162,41 @@ the variable."
(goto-char (point-min)) (goto-char (point-min))
(let* ((params (append args '((:results . "silent")))) (let* ((params (append args '((:results . "silent"))))
(regexp (org-babel-named-data-regexp-for-name ref)) (regexp (org-babel-named-data-regexp-for-name ref))
lob-info
(result (result
(cond (catch :found
;; Check for code blocks or named data. ;; Check for code blocks or named data.
((catch :found (while (re-search-forward regexp nil t)
(while (re-search-forward regexp nil t) ;; Ignore COMMENTed headings and orphaned
;; Ignore COMMENTed headings and orphaned ;; affiliated keywords.
;; affiliated keywords. (unless (org-in-commented-heading-p)
(unless (org-in-commented-heading-p) (let ((e (org-element-at-point)))
(let ((e (org-element-at-point))) (when (equal (org-element-property :name e) ref)
(when (equal (org-element-property :name e) ref) (goto-char
(goto-char (org-element-property :post-affiliated e))
(org-element-property :post-affiliated e)) (pcase (org-element-type e)
(pcase (org-element-type e) (`babel-call
(`babel-call (throw :found
(throw :found (org-babel-lob-execute
(org-babel-lob-execute (org-babel-lob-get-info))))
(org-babel-lob-get-info)))) (`src-block
(`src-block (throw :found
(throw :found (org-babel-execute-src-block
(org-babel-execute-src-block nil nil
nil nil (and
(and (not org-babel-update-intermediate)
(not org-babel-update-intermediate) params))))
params)))) ((and (let v (org-babel-read-element e))
((and (let v (org-babel-read-element e)) (guard v))
(guard v)) (throw :found v))
(throw :found v)) (_ (error "Reference not found")))))))
(_ (error "Reference not found"))))))) ;; Check for local or global headlines by ID.
nil)) (when (org-babel-ref-goto-headline-id ref)
;; Check for local or global headlines by ID. (throw :found (org-babel-ref-headline-body)))
((org-babel-ref-goto-headline-id ref) ;; Check the Library of Babel.
(org-babel-ref-headline-body)) (let ((lob-info (cdr (assq (intern ref) org-babel-library-of-babel))))
;; Check the Library of Babel. (when lob-info
((setq lob-info (throw :found (org-babel-execute-src-block nil lob-info params))))
(cdr (assq (intern ref) org-babel-library-of-babel))) (t (error "Reference `%s' not found in this buffer" ref)))))
(org-babel-execute-src-block nil lob-info params))
(t (error "Reference `%s' not found in this buffer" ref)))))
(cond (cond
((symbolp result) (format "%S" result)) ((symbolp result) (format "%S" result))
((and index (listp result)) ((and index (listp result))