[elpa] externals/org-remark 779da5ba97 1/3: fix: apply Stefan Monnier patch via diff (WIP)

[ELPA Syncer]

branch: externals/org-remark
commit 779da5ba97bf26d6d3161dac886aa878416e7f1a
Author: Noboru Ota <me@nobiot.com>
Commit: Noboru Ota <me@nobiot.com>

    fix: apply Stefan Monnier patch via diff (WIP)
    
    The suggestion in email is still to be considered and incoporated.
---
 .gitignore                    | 3 +++
 org-remark-global-tracking.el | 6 +++---
 org-remark.el                 | 9 ++++-----
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5953ca07fb..b22702f38b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,6 @@
 test
 test*
 
+# ELPA-generated files.
+/org-remark-autoloads.el
+/org-remark-pkg.el
diff --git a/org-remark-global-tracking.el b/org-remark-global-tracking.el
index e4efdb7d61..f2786342ad 100644
--- a/org-remark-global-tracking.el
+++ b/org-remark-global-tracking.el
@@ -5,7 +5,7 @@
 ;; Author: Noboru Ota <me@nobiot.com>
 ;; URL: https://github.com/nobiot/org-remark
 ;; Created: 15 August 2021
-;; Last modified: 31 January 2022
+;; Last modified: 01 February 2022
 ;; Package-Requires: ((emacs "27.1") (org "9.4"))
 ;; Keywords: org-mode, annotation, writing, note-taking, marginal notes
 
@@ -44,6 +44,7 @@ If it is a function, the default function is
 like this: \"FILE-notes.org\" by adding \"-notes.org\" as a
 suffix to the file name without the extension."
   :group 'org-remark
+  :safe #'stringp
   :type '(choice
           (file "marginalia.org")
           (function org-remark-notes-file-path-function)))
@@ -87,9 +88,8 @@ value."
   (if-let ((fn (when (functionp org-remark-notes-file-path)
                  org-remark-notes-file-path)))
       (funcall fn)
-    ;; If not funciton, assume string and return it as the file path
+    ;; If not function, assume string and return it as the file path.
     org-remark-notes-file-path))
-
 (defun org-remark-notes-file-path-function ()
   "Return a marginal notes file name for the current buffer.
 
diff --git a/org-remark.el b/org-remark.el
index f5dd654143..e742761240 100644
--- a/org-remark.el
+++ b/org-remark.el
@@ -916,7 +916,7 @@ load the highlights"
   "Return a list of highlights from the marginal notes file path.
 The file path is returned by `org-remark-notes-get-file-path'.
 Each highlight is a list in the following structure:
-    (id (beg . end) label)"
+    (ID (BEG . END) LABEL)"
   (when-let ((notes-buf (find-file-noselect (org-remark-notes-get-file-path)))
              (source-path (org-remark-source-path (buffer-file-name))))
     ;; TODO check if there is any relevant notes for the current file
@@ -1050,9 +1050,8 @@ Case 2. The overlay points to no buffer
 
 
 ;;;;; Other utilities
-
-(defun org-remark-source-path (path)
-  "Covert PATH either to absolute or relative for marginal notes files.
+ (defun org-remark-source-path (path)
+  "Convert PATH either to absolute or relative for marginal notes files.
 Returns the standardized path.  Currently, it's only a place
 holder and uses `abbreviate-file-name' to return an absolute
 path."
@@ -1083,5 +1082,5 @@ function extends the behavior and looks for the word at 
point"
 ;;; org-remark.el ends here
 
 ;; Local Variables:
-;; eval: (setq-local org-remark-notes-file-path "README.org")
+;; org-remark-notes-file-path: "README.org"
 ;; End: