Ihor Radchenko <yanta...@posteo.net> writes:
Hello, Ihor!
>> I noticed that org-refile-get-targets seems to recalculate the first
>> part of the outline path for each heading, which makes it slow on large
>> It feels like a pretty small change (just adding a let), but I
>> have copyright assignment papers on file at the FSF just in case.
> Agree. Yet, the tests are failing :)
> 1 unexpected results:
> FAILED test-org/refile-get-targets ((should (equal '("H1\\/foo")
> (org-test-with-temp-text "* H1/foo" (let (... ...) (mapcar ... ...))))) :form
> (equal ("H1\\/foo") ("H1")) :value nil :explanation (list-elt 0
> (arrays-of-different-length 7 2 "H1\\/foo" "H1" first-mismatch-at 2)))
Whoops, sorry, I forgot to run the tests. =) Now that I have done so, I
realized that I accidentally deleted the
(goto-char (point-min))
(setq org-outline-path-cache nil)
before the loop. This patch should make that test run again. Once more
with feeling!
Sacha
>From ef843a24848203adc58aa3cfbafcb50639126921 Mon Sep 17 00:00:00 2001
From: Sacha Chua <sa...@sachachua.com>
Date: Sun, 13 Oct 2024 21:30:29 -0400
Subject: [PATCH] org-refile: calculate file part of the outline path once per
file
* lisp/org-refile.el (org-refile-get-targets): Calculate the file part
of the outline path once per file, improving the performance when
org-refile-use-outline-path is set to 'title.
---
lisp/org-refile.el | 85 +++++++++++++++++++++++-----------------------
1 file changed, 43 insertions(+), 42 deletions(-)
diff --git a/lisp/org-refile.el b/lisp/org-refile.el
index 6da5f6482..474706fe3 100644
--- a/lisp/org-refile.el
+++ b/lisp/org-refile.el
@@ -341,50 +341,51 @@ defun org-refile-get-targets
(org-with-wide-buffer
(goto-char (point-min))
(setq org-outline-path-cache nil)
- (while (re-search-forward descre nil t)
- (forward-line 0)
- (let ((case-fold-search nil))
- (looking-at org-complex-heading-regexp))
- (let ((begin (point))
- (heading (match-string-no-properties 4)))
- (unless (or (and
- org-refile-target-verify-function
- (not
- (funcall org-refile-target-verify-function)))
- (not heading))
- (let ((re (format org-complex-heading-regexp-format
- (regexp-quote heading)))
- (target
- (if (not org-refile-use-outline-path) heading
- (mapconcat
- #'identity
- (append
- (pcase org-refile-use-outline-path
- (`file (list
+ (let ((base (pcase org-refile-use-outline-path
+ (`file (list
+ (and (buffer-file-name (buffer-base-buffer))
+ (file-name-nondirectory
+ (buffer-file-name (buffer-base-buffer))))))
+ (`title (list
+ (or (org-get-title)
(and (buffer-file-name (buffer-base-buffer))
(file-name-nondirectory
- (buffer-file-name (buffer-base-buffer))))))
- (`title (list
- (or (org-get-title)
- (and (buffer-file-name (buffer-base-buffer))
- (file-name-nondirectory
- (buffer-file-name (buffer-base-buffer)))))))
- (`full-file-path
- (list (buffer-file-name
- (buffer-base-buffer))))
- (`buffer-name
- (list (buffer-name
- (buffer-base-buffer))))
- (_ nil))
- (mapcar (lambda (s) (replace-regexp-in-string
- "/" "\\/" s nil t))
- (org-get-outline-path t t)))
- "/"))))
- (push (list target f re (org-refile-marker (point)))
- tgs)))
- (when (= (point) begin)
- ;; Verification function has not moved point.
- (end-of-line)))))))
+ (buffer-file-name (buffer-base-buffer)))))))
+ (`full-file-path
+ (list (buffer-file-name
+ (buffer-base-buffer))))
+ (`buffer-name
+ (list (buffer-name
+ (buffer-base-buffer))))
+ (_ nil))))
+ (while (re-search-forward descre nil t)
+ (forward-line 0)
+ (let ((case-fold-search nil))
+ (looking-at org-complex-heading-regexp))
+ (let ((begin (point))
+ (heading (match-string-no-properties 4)))
+ (unless (or (and
+ org-refile-target-verify-function
+ (not
+ (funcall org-refile-target-verify-function)))
+ (not heading))
+ (let ((re (format org-complex-heading-regexp-format
+ (regexp-quote heading)))
+ (target
+ (if (not org-refile-use-outline-path) heading
+ (mapconcat
+ #'identity
+ (append
+ base
+ (mapcar (lambda (s) (replace-regexp-in-string
+ "/" "\\/" s nil t))
+ (org-get-outline-path t t)))
+ "/"))))
+ (push (list target f re (org-refile-marker (point)))
+ tgs)))
+ (when (= (point) begin)
+ ;; Verification function has not moved point.
+ (end-of-line))))))))
(when org-refile-use-cache
(org-refile-cache-put tgs (buffer-file-name) descre))
(setq targets (append tgs targets))))))
--
2.43.0
