branch: externals-release/org
commit 13e0350729e0d2aea72211cd68f9e9e8c139c8c6
Author: Kyle Meyer <[email protected]>
Commit: Kyle Meyer <[email protected]>
org-fold-core: Rename another function for American spelling
* lisp/org-fold-core.el (org-fold-core-remove-optimization): Rename
from org-fold-core-remove-optimisation, leaving an alias behind.
* lisp/org.el (org-get-heading):
(org-heading-components): Use the new names.
This rename was supposed to be done as part of 90ce752f3 (Ensure
American spelling across docstrings, comments, and symbol names,
2026-01-03). That patch was based on changes already applied in Emacs
(481ad70d5).
Link:
https://list.orgmode.org/[email protected]
---
lisp/org-fold-core.el | 5 ++++-
lisp/org.el | 4 ++--
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/lisp/org-fold-core.el b/lisp/org-fold-core.el
index 238815bbc2..97cc88ce99 100644
--- a/lisp/org-fold-core.el
+++ b/lisp/org-fold-core.el
@@ -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 b8d22309ea..82b8aa24f6 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)))
