branch: externals/org
commit 6994fb7fdda89245095efba284e88dcd3d96c0d3
Merge: b9ba12c2cb 09c585c602
Author: Ihor Radchenko <[email protected]>
Commit: Ihor Radchenko <[email protected]>
Merge branch 'bugfix'
---
lisp/org-fold-core.el | 7 +++++--
lisp/org.el | 4 ++--
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/lisp/org-fold-core.el b/lisp/org-fold-core.el
index 238815bbc2..5aef5002f8 100644
--- a/lisp/org-fold-core.el
+++ b/lisp/org-fold-core.el
@@ -251,7 +251,7 @@
;; with `grab-invisible' option, folded regions copied to other
;; buffers (including buffers that do not use this library) will
;; remain invisible. org-fold-core provides functions to work around
-;; this issue: `org-fold-core-remove-optimisation' and
`org-fold-core-update-optimization', but
+;; this issue: `org-fold-core-remove-optimization' and
`org-fold-core-update-optimization', but
;; it is unlikely that a random external package will use them.
;; Another possible bottleneck is the fragility check after the change
@@ -1624,7 +1624,7 @@ See `org-fold-core--optimize-for-huge-buffers'."
'org-fold-core-update-optimisation
#'org-fold-core-update-optimization "9.8")
-(defun org-fold-core-remove-optimisation (beg end)
+(defun org-fold-core-remove-optimization (beg end)
"Remove huge buffer optimization between BEG and END.
See `org-fold-core--optimize-for-huge-buffers'."
(when (and (memql 'grab-invisible org-fold-core--optimize-for-huge-buffers)
@@ -1636,6 +1636,9 @@ See `org-fold-core--optimize-for-huge-buffers'."
(remove-text-properties pos
(org-fold-core-next-folding-state-change (caar org-fold-core--specs) pos end)
'(invisible t)))
(setq pos (org-fold-core-next-folding-state-change (caar
org-fold-core--specs) pos end))))))
+(define-obsolete-function-alias
+ 'org-fold-core-remove-optimisation
+ #'org-fold-core-remove-optimization "9.8")
(provide 'org-fold-core)
diff --git a/lisp/org.el b/lisp/org.el
index fb93dcbea8..222af988aa 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -6793,7 +6793,7 @@ Return nil before first heading."
;; When using `org-fold-core--optimize-for-huge-buffers',
;; returned text will be invisible. Clear it up.
(save-match-data
- (org-fold-core-remove-optimisation (match-beginning 0) (match-end
0)))
+ (org-fold-core-remove-optimization (match-beginning 0) (match-end
0)))
(let ((todo (and (not no-todo) (match-string 2)))
(priority (and (not no-priority) (match-string 3)))
(headline (pcase (match-string 4)
@@ -6823,7 +6823,7 @@ This is a list with the following elements:
(save-excursion
(org-back-to-heading t)
(when (let (case-fold-search) (looking-at org-complex-heading-regexp))
- (org-fold-core-remove-optimisation (match-beginning 0) (match-end 0))
+ (org-fold-core-remove-optimization (match-beginning 0) (match-end 0))
(prog1
(list (length (match-string 1))
(org-reduced-level (length (match-string 1)))
