mirrors/org-mode
0
0
Fork 1
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-09-29 22:07:49 +00:00
Code Releases Activity

ob-ref: cleanup of variable usage and indentation

Browse source 
* lisp/ob-ref.el (org-babel-ref-resolve): cleanup of variable usage
and indentation
This commit is contained in:
Eric Schulte 2010-10-16 13:11:02 -06:00 committed by Dan Davison
parent a5ac523ec9
commit dc9401f95b
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
lisp/ob-ref.el
View file

@ -109,12 +109,10 @@ return nil."
(when (string-match "^\\(.+?\\)\(\\(.*\\)\)$" ref) (when (string-match "^\\(.+?\\)\(\\(.*\\)\)$" ref)
(setq new-refere (match-string 1 ref)) (setq new-refere (match-string 1 ref))
(setq new-referent (match-string 2 ref)) (setq new-referent (match-string 2 ref))
;; (message "new-refere=%S, new-referent=%S" new-refere new-referent) ;; debugging
(when (> (length new-refere) 0) (when (> (length new-refere) 0)
(if (> (length new-referent) 0) (if (> (length new-referent) 0)
(setq args (mapcar (lambda (ref) (cons :var ref)) (setq args (mapcar (lambda (ref) (cons :var ref))
(org-babel-ref-split-args new-referent)))) (org-babel-ref-split-args new-referent))))
;; (message "args=%S" args) ;; debugging
(setq ref new-refere))) (setq ref new-refere)))
(when (string-match "^\\(.+\\):\\(.+\\)$" ref) (when (string-match "^\\(.+\\):\\(.+\\)$" ref)
(setq split-file (match-string 1 ref)) (setq split-file (match-string 1 ref))
@ -123,7 +121,8 @@ return nil."
(save-restriction (save-restriction
(widen) (widen)
(goto-char (point-min)) (goto-char (point-min))
(if (let ((result_regexp (concat "^[ \t]*#\\+\\(TBLNAME\\|RESNAME\\|RESULTS\\):[ \t]*" (if (let ((result_regexp (concat "^[ \t]*#\\+\\(TBLNAME\\|RESNAME"
"\\|RESULTS\\):[ \t]*"
(regexp-quote ref) "[ \t]*$")) (regexp-quote ref) "[ \t]*$"))
(regexp (concat org-babel-src-name-regexp (regexp (concat org-babel-src-name-regexp
(regexp-quote ref) "\\(\(.*\)\\)?" "[ \t]*$"))) (regexp-quote ref) "\\(\(.*\)\\)?" "[ \t]*$")))
@ -134,7 +133,8 @@ return nil."
(re-search-forward regexp nil t) (re-search-forward regexp nil t)
(re-search-backward regexp nil t) (re-search-backward regexp nil t)
;; check the Library of Babel ;; check the Library of Babel
(setq lob-info (cdr (assoc (intern ref) org-babel-library-of-babel))))) (setq lob-info (cdr (assoc (intern ref)
org-babel-library-of-babel)))))
(unless lob-info (goto-char (match-beginning 0))) (unless lob-info (goto-char (match-beginning 0)))
;; ;; TODO: allow searching for names in other buffers ;; ;; TODO: allow searching for names in other buffers
;; (setq id-loc (org-id-find ref 'marker) ;; (setq id-loc (org-id-find ref 'marker)
@ -149,14 +149,15 @@ return nil."
(beginning-of-line) (beginning-of-line)
(if (or (= (point) (point-min)) (= (point) (point-max))) (if (or (= (point) (point-min)) (= (point) (point-max)))
(error "reference not found")))) (error "reference not found"))))
(setq params (org-babel-process-params '((:results . "silent"))))
(setq result (setq result
(case type (case type
('results-line (org-babel-read-result)) ('results-line (org-babel-read-result))
('table (org-babel-read-table)) ('table (org-babel-read-table))
('file (org-babel-read-link)) ('file (org-babel-read-link))
('source-block (org-babel-execute-src-block nil nil params)) ('source-block (org-babel-execute-src-block
('lob (org-babel-execute-src-block nil lob-info params)))) nil nil '((:results . "silent"))))
('lob (org-babel-execute-src-block
nil lob-info '((:results . "silent"))))))
(if (symbolp result) (if (symbolp result)
(format "%S" result) (format "%S" result)
(if (and index (listp result)) (if (and index (listp result))