From f3292797579e9f2da1f7b3ac4c318a5282bdd3fa Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 5 Nov 2015 09:20:05 +0100
Subject: [PATCH] ox: Check id links in export scope only

* lisp/ox.el (org-export-get-environment): Do not fill :id-alist yet.
(org-export-collect-tree-properties): Complete it here instead.

Reported-by: Samuel Wales <samologist@gmail.com>
<http://permalink.gmane.org/gmane.emacs.orgmode/102540>
---
 lisp/ox.el | 44 ++++++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/lisp/ox.el b/lisp/ox.el
index 5f1611849..cbdcb8103 100644
--- a/lisp/ox.el
+++ b/lisp/ox.el
@@ -1338,23 +1338,8 @@ inferior to file-local settings."
    ;; ... and from subtree, when appropriate.
    (and subtreep (org-export--get-subtree-options backend))
    ;; Eventually add misc. properties.
-   (list
-    :back-end
-    backend
-    :translate-alist (org-export-get-all-transcoders backend)
-    :id-alist
-    ;; Collect id references.
-    (let (alist)
-      (org-with-wide-buffer
-       (goto-char (point-min))
-       (while (re-search-forward "\\[\\[id:\\S-+?\\]" nil t)
-	 (let ((link (org-element-context)))
-	   (when (eq (org-element-type link) 'link)
-	     (let* ((id (org-element-property :path link))
-		    (file (car (org-id-find id))))
-	       (when file
-		 (push (cons id (file-relative-name file)) alist)))))))
-      alist))))
+   (list :back-end backend
+	 :translate-alist (org-export-get-all-transcoders backend))))
 
 (defun org-export--parse-option-keyword (options &optional backend)
   "Parse an OPTIONS line and return values as a plist.
@@ -1659,9 +1644,12 @@ Following tree properties are set or updated:
 		   of level 2 should be considered as a level
 		   1 headline in the context.
 
-`:headline-numbering' Alist of all headlines as key an the
+`:headline-numbering' Alist of all headlines as key and the
 		      associated numbering as value.
 
+`:id-alist' Alist of all ID references as key and associated file
+            as value.
+
 Return updated plist."
   ;; Install the parse tree in the communication channel.
   (setq info (plist-put info :parse-tree data))
@@ -1673,10 +1661,22 @@ Return updated plist."
 		   (- 1 (org-export--get-min-level data info))))
   ;; Properties order doesn't matter: get the rest of the tree
   ;; properties.
-  (nconc
-   `(:headline-numbering ,(org-export--collect-headline-numbering data info)
-     :exported-data ,(make-hash-table :test 'eq :size 4001))
-   info))
+  (setq info
+	(plist-put info
+		   :headline-numbering
+		   (org-export--collect-headline-numbering data info)))
+  (setq info
+	(plist-put info
+		   :exported-data (make-hash-table :test #'eq :size 4001)))
+  (plist-put info
+	     :id-alist
+	     ;; Collect id references.
+	     (org-element-map data 'link
+	       (lambda (l)
+		 (and (string= (org-element-property :type l) "id")
+		      (let* ((id (org-element-property :path l))
+			     (file (car (org-id-find id))))
+			(and file (cons id (file-relative-name file)))))))))
 
 (defun org-export--get-min-level (data options)
   "Return minimum exportable headline's level in DATA.