ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

when present resolve orig-buffer headlines w/IDs 

* lisp/ob-exp.el (org-babel-exp-in-export-file): Instead of using the
  headline text use the headline ID when one is present.  This fixes a
  bug in the resolution of code block headers in properties during
  export when multiple headlines with the same name are present.
This commit is contained in:
Eric Schulte 2014-06-06 12:04:04 -04:00
parent c261928cb5
commit 266233164f
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lisp/ob-exp.el
View File

@ -66,7 +66,12 @@ be executed."
(defmacro org-babel-exp-in-export-file (lang &rest body) (defmacro org-babel-exp-in-export-file (lang &rest body)
(declare (indent 1)) (declare (indent 1))
`(let* ((lang-headers (intern (concat "org-babel-default-header-args:" ,lang))) `(let* ((lang-headers (intern (concat "org-babel-default-header-args:" ,lang)))
(heading (nth 4 (ignore-errors (org-heading-components)))) (heading-query (or (org-id-get)
;; CUSTOM_IDs don't work, maybe they are
;; stripped, or maybe they resolve too
;; late in `org-link-search'.
;; (org-entry-get nil "CUSTOM_ID")
(nth 4 (ignore-errors (org-heading-components)))))
(export-buffer (current-buffer)) (export-buffer (current-buffer))
results) results)
(when org-babel-exp-reference-buffer (when org-babel-exp-reference-buffer
@ -75,17 +80,17 @@ be executed."
;; heading in the original file ;; heading in the original file
(set-buffer org-babel-exp-reference-buffer) (set-buffer org-babel-exp-reference-buffer)
(save-restriction (save-restriction
(when heading (when heading-query
(condition-case nil (condition-case nil
(let ((org-link-search-inhibit-query t)) (let ((org-link-search-inhibit-query t))
;; TODO: When multiple headings have the same title, ;; TODO: When multiple headings have the same title,
;; this returns the first, which is not always ;; this returns the first, which is not always
;; the right heading. Consider a better way to ;; the right heading. Consider a better way to
;; find the proper heading. ;; find the proper heading.
(org-link-search heading)) (org-link-search heading-query))
(error (when heading (error (when heading-query
(goto-char (point-min)) (goto-char (point-min))
(re-search-forward (regexp-quote heading) nil t))))) (re-search-forward (regexp-quote heading-query) nil t)))))
(setq results ,@body)) (setq results ,@body))
(set-buffer export-buffer) (set-buffer export-buffer)
results))) results)))