branch: externals/org-remark
commit 618d60393961f83f0e18881d970f070063064f13
Author: Noboru Ota <m...@nobiot.com>
Commit: Noboru Ota <m...@nobiot.com>
fix: move org-remark-source-find-file-name to tracking
With the eww support, function 'org-remark-source-find-file-name' is
required by 'org-remark-global-tracking'. This is because
org-remark-global-tracking-mode is designed to be turned on without
requiring org-remark so that loading the entire org library can be
differed until the first org file is opened.
---
org-remark-global-tracking.el | 15 ++++++++++++---
org-remark.el | 14 ++------------
2 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/org-remark-global-tracking.el b/org-remark-global-tracking.el
index d333c7c2ea..445db3d183 100644
--- a/org-remark-global-tracking.el
+++ b/org-remark-global-tracking.el
@@ -5,9 +5,9 @@
;; Author: Noboru Ota <m...@nobiot.com>
;; URL: https://github.com/nobiot/org-remark
;; Created: 15 August 2021
-;; Last modified: 13 February 2022
+;; Last modified: 14 December 2022
;; Package-Requires: ((emacs "27.1") (org "9.4"))
-;; Keywords: org-mode, annotation, writing, note-taking, marginal notes
+;; Keywords: org-mode, annotation, note-taking, marginal-notes, wp
;; This file is not part of GNU Emacs.
@@ -30,7 +30,6 @@
;;; Code:
(declare-function org-remark-mode "org-remark")
-(declare-function org-remark-source-find-file-name "org-remark")
(defvaralias 'org-remark-notes-file-path 'org-remark-notes-file-name)
@@ -113,6 +112,16 @@ This function is meant to be added to `find-file-hook' by
;; If not function, assume string and return it as the file path.
org-remark-notes-file-name))
+(defun org-remark-source-find-file-name ()
+ "Assumes that we are currently in the source buffer.
+Returns the filename for the soure buffer. We use this filename
+to identify the source buffer in all operations related to
+marginalia."
+ (if (eq major-mode 'eww-mode)
+ (let ((url-parsed (url-generic-parse-url (eww-current-url))))
+ (concat (url-host url-parsed) (url-filename url-parsed)))
+ (buffer-file-name)))
+
(provide 'org-remark-global-tracking)
;;; org-remark-global-tracking.el ends here
diff --git a/org-remark.el b/org-remark.el
index 8737d83d69..d16d6f2395 100644
--- a/org-remark.el
+++ b/org-remark.el
@@ -6,9 +6,9 @@
;; URL: https://github.com/nobiot/org-remark
;; Version: 1.0.5
;; Created: 22 December 2020
-;; Last modified: 23 August 2022
+;; Last modified: 14 December 2022
;; Package-Requires: ((emacs "27.1") (org "9.4"))
-;; Keywords: org-mode, annotation, writing, note-taking, marginal-notes
+;; Keywords: org-mode, annotation, note-taking, marginal-notes, wp,
;; This file is not part of GNU Emacs.
@@ -377,16 +377,6 @@ marginal notes file. The expected values are nil, :load
and
'(:underline "gold" :background "lemon chiffon")
'(CATEGORY "important")))
-(defun org-remark-source-find-file-name ()
- "Assumes that we are currently in the source buffer.
-Returns the filename for the soure buffer. We use this filename
-to identify the source buffer in all operations related to
-marginalia."
- (if (eq major-mode 'eww-mode)
- (let ((url-parsed (url-generic-parse-url (eww-current-url))))
- (concat (url-host url-parsed) (url-filename url-parsed)))
- (buffer-file-name)))
-
(defun org-remark-save ()
"Save all the highlights tracked in current buffer to notes file.
