From c8c9cb8339f1df10522b27f8410855c82c774ccf Mon Sep 17 00:00:00 2001
From: Kaushal Modi <kaushal.modi@gmail.com>
Date: Fri, 18 Mar 2022 01:55:31 -0400
Subject: [PATCH] fix: Set the starting position to search for EXPORT_OPTIONS

When the target file is not open, the start position defaults to 1 and
so the EXPORT_OPTIONS in the heading where we intend to search is
never found.
---
 ox-hugo.el           | 18 ++++++++++++++----
 test/ert/telement.el | 28 ++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 4 deletions(-)

diff --git a/ox-hugo.el b/ox-hugo.el
index a5482c51..fd290622 100644
--- a/ox-hugo.el
+++ b/ox-hugo.el
@@ -1910,12 +1910,15 @@ This function will never return nil."
                    "")))
     (substring (md5 title) 0 hash-len)))
 
-(defun org-hugo--get-elem-with-prop (prop &optional _info)
+(defun org-hugo--get-elem-with-prop (prop &optional pom _info)
   "Find the first element with PROP property in the current tree.
 
 PROP is a property symbol with a : prefix, example:
 `:EXPORT_FILE_NAME'.
 
+Optional argument POM is the position or marker from which the
+upward search for PROP should begin.
+
 Return a cons of type (ELEM . PVAL) where ELEM is the element
 containing the property PROP and PVAL is the property's value.
 
@@ -1926,13 +1929,17 @@ versions for the issue that `org-element-at-point' does not
 return an element with all the inherited properties.  That issue
 is fixed in Org main branch at least as of 2022-03-17."
   (org-with-wide-buffer
+   ;; (message (format "[search prop DBG] point 1 : %S" (point)))
+   (when pom
+     (goto-char pom))
+   ;; (message (format "[search prop DBG] point 2 : %S" (point)))
    (org-back-to-heading-or-point-min :invisible-ok)
    (let ((elem (org-element-at-point))
          (level t)
          pval)
      (catch :found
        (while elem
-         ;; (message (format "[search prop DBG] elem : %S" elem ))
+         ;; (message (format "[search prop DBG] prop %S, elem : %S" prop elem))
          (setq pval (org-element-property prop elem))
          ;; (message "[search prop DBG] level %S, pval %S" level pval)
          (when (or pval (null level))
@@ -1973,7 +1980,7 @@ INFO is a plist used as a communication channel.
 Return nil if none of the above are true."
   (org-with-wide-buffer
    (let ((heading-begin (org-element-property :begin heading)))
-     (when (numberp heading-begin)
+     (when heading-begin
        (goto-char heading-begin)))
    (let ((file (org-string-nw-p (org-export-get-node-property :EXPORT_FILE_NAME heading inherit-export-file-name)))
          bundle slug)
@@ -4489,7 +4496,10 @@ links."
                                                            ;; in a parent heading.
                                                            (plist-get
                                                             (org-export--parse-option-keyword
-                                                             (or (cdr (org-hugo--get-elem-with-prop :EXPORT_OPTIONS)) ""))
+                                                             (or (cdr (org-hugo--get-elem-with-prop
+                                                                       :EXPORT_OPTIONS
+                                                                       (org-element-property :begin el)))
+                                                                 ""))
                                                             :with-broken-links))
                                                  (user-error "Unable to resolve link: %S" (nth 1 err))))))
                                         (org-export-resolve-id-link el (org-export--collect-tree-properties ast info))))
diff --git a/test/ert/telement.el b/test/ert/telement.el
index ef3c8750..8ac7a9e2 100644
--- a/test/ert/telement.el
+++ b/test/ert/telement.el
@@ -111,5 +111,33 @@
 <point>"
               (cdr (org-hugo--get-elem-with-prop :EXPORT_HUGO_SECTION))))))
 
+(ert-deftest test-elem/starting-position ()
+  "Test property lookup by specifying the starting position."
+
+  ;; Here, the needed property is not found because the starting
+  ;; position for search is set to the beginning of the buffer.
+  (should
+   (equal nil
+          (org-test-with-parsed-data
+              "
+* Heading 1<point>
+:PROPERTIES:
+:EXPORT_OPTIONS: toc:t
+:END:"
+            (cdr (org-hugo--get-elem-with-prop :EXPORT_OPTIONS 1)))))
+
+  ;; Here, the needed property *is* found because the starting
+  ;; position for search is set correctly, and that overrides the init
+  ;; position set by <point> in this test.
+  (should
+   (string= "toc:t"
+            (org-test-with-parsed-data
+                "<point>
+* Heading 2
+:PROPERTIES:
+:EXPORT_OPTIONS: toc:t
+:END:"
+              (cdr (org-hugo--get-elem-with-prop :EXPORT_OPTIONS 2))))))
+
 
 (provide 'telement)