diff --git a/lisp/org/ChangeLog.1 b/lisp/org/ChangeLog.1
index a2f9ff6e162..4547877a034 100644
--- a/lisp/org/ChangeLog.1
+++ b/lisp/org/ChangeLog.1
@@ -4002,7 +4002,7 @@
(org-agenda-prepare-buffers):
Honor `org-agenda-ignore-drawer-properties'.
- * org-clock.el (org-clock-goto): Recenter to thrd line
+ * org-clock.el (org-clock-goto): Recenter to third line
* org-table.el (orgtbl-send-replace-tbl): Allow multiple spaces
between keywords in RECEIVE ORGTBL lines.
diff --git a/lisp/org/oc-basic.el b/lisp/org/oc-basic.el
index 32a99e98709..cda9328fb75 100644
--- a/lisp/org/oc-basic.el
+++ b/lisp/org/oc-basic.el
@@ -370,7 +370,7 @@ org-cite-basic--shorten-names
"Return a list of family names from a list of full NAMES.
NAMES can be a string or raw string object.
-To better accomomodate corporate names, this will only shorten
+To better accommodate corporate names, this will only shorten
personal names of the form \"family, given\"."
(let (names-string raw-p)
(cond
diff --git a/lisp/org/ol.el b/lisp/org/ol.el
index 603dc26d416..e06f59b4f1c 100644
--- a/lisp/org/ol.el
+++ b/lisp/org/ol.el
@@ -1160,7 +1160,7 @@ org-link-expand-abbrev
((string-match "%(\\([^)]+\\))" rpl)
(let ((rpl-fun-symbol (intern-soft (match-string 1 rpl))))
;; Using `unsafep-function' is not quite enough because
- ;; Emacs considers functions like `genenv' safe, while
+ ;; Emacs considers functions like `getenv' safe, while
;; they can potentially be used to expose private system
;; data to attacker if abbreviated link is clicked.
(if (or (eq t (get rpl-fun-symbol 'org-link-abbrev-safe))
diff --git a/lisp/org/org-fold-core.el b/lisp/org/org-fold-core.el
index a2e84f73c0e..d9a9d04ea8d 100644
--- a/lisp/org/org-fold-core.el
+++ b/lisp/org/org-fold-core.el
@@ -236,12 +236,12 @@
;; recommended to minimize the number of folding specs used in the
;; same buffer at a time.
-;; Alternatively, the library provides `org-fold-core--optimise-for-huge-buffers'
+;; Alternatively, the library provides `org-fold-core--optimize-for-huge-buffers'
;; for additional speedup. This can be used as a file-local variable
;; in huge buffers. The variable can be set to enable various levels
;; of extra optimization. See the docstring for detailed information.
-;; It is worth noting that when using `org-fold-core--optimise-for-huge-buffers'
+;; It is worth noting that when using `org-fold-core--optimize-for-huge-buffers'
;; 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
@@ -300,7 +300,7 @@ org-fold-core-isearch-open-function
The function is called with a single argument - point where text is to
be revealed.")
-(defvar-local org-fold-core--optimise-for-huge-buffers nil
+(defvar-local org-fold-core--optimize-for-huge-buffers nil
"Non-nil turns on extra speedup on huge buffers (Mbs of folded text).
This setting is risky and may cause various artifacts and degraded
@@ -340,7 +340,7 @@ org-fold-core--optimise-for-huge-buffers
- `merge-folds': Do not distinguish between different types of folding
specs. This is the most aggressive optimization with unforeseen and
potentially drastic effects.")
-(put 'org-fold-core--optimise-for-huge-buffers 'safe-local-variable 'listp)
+(put 'org-fold-core--optimize-for-huge-buffers 'safe-local-variable 'listp)
;;; Core functionality
@@ -445,10 +445,10 @@ org-fold-core-get-folding-spec-property
"Get PROPERTY of a folding SPEC-OR-ALIAS.
Possible properties can be found in `org-fold-core--specs' docstring."
(org-fold-core--check-spec spec-or-alias)
- (if (and (memql 'ignore-indirect org-fold-core--optimise-for-huge-buffers)
+ (if (and (memql 'ignore-indirect org-fold-core--optimize-for-huge-buffers)
(eq property :global))
t
- (if (and (memql 'merge-folds org-fold-core--optimise-for-huge-buffers)
+ (if (and (memql 'merge-folds org-fold-core--optimize-for-huge-buffers)
(eq property :visible))
nil
(cdr (assq property (assq (org-fold-core-get-folding-spec-from-alias spec-or-alias) org-fold-core--specs))))))
@@ -459,7 +459,7 @@ org-fold-core--spec-property-prefix
(defsubst org-fold-core-get-folding-property-symbol (spec &optional buffer global)
"Get folding text property using to store SPEC in current buffer or BUFFER.
If GLOBAL is non-nil, do not make the property unique in the BUFFER."
- (if (memql 'merge-folds org-fold-core--optimise-for-huge-buffers)
+ (if (memql 'merge-folds org-fold-core--optimize-for-huge-buffers)
(intern (format "%s-global" org-fold-core--spec-property-prefix))
(intern (format (concat org-fold-core--spec-property-prefix "%s-%S")
(symbol-name spec)
@@ -468,7 +468,7 @@ org-fold-core-get-folding-property-symbol
;; buffer-local text property actually matters is an indirect
;; buffer, where the name cannot be same anyway.
(if (or global
- (memql 'ignore-indirect org-fold-core--optimise-for-huge-buffers))
+ (memql 'ignore-indirect org-fold-core--optimize-for-huge-buffers))
'global
(sxhash (buffer-name (or buffer (current-buffer)))))))))
@@ -538,7 +538,7 @@ org-fold-core-cycle-over-indirect-buffers
;; This is the core function used to fold text in buffers. We use
;; text properties to hide folded text, however 'invisible property is
-;; not directly used (unless risky `org-fold-core--optimise-for-huge-buffers' is
+;; not directly used (unless risky `org-fold-core--optimize-for-huge-buffers' is
;; enabled). Instead, we define unique text property (folding
;; property) for every possible folding spec and add the resulting
;; text properties into `char-property-alias-alist', so that
@@ -651,7 +651,7 @@ org-fold-core-decouple-indirect-buffer-folds
(delete-dups bufs))))))
(when (and (buffer-base-buffer)
(eq org-fold-core-style 'text-properties)
- (not (memql 'ignore-indirect org-fold-core--optimise-for-huge-buffers)))
+ (not (memql 'ignore-indirect org-fold-core--optimize-for-huge-buffers)))
(org-fold-core--update-buffer-folds)))
;;; API
@@ -669,7 +669,7 @@ org-fold-core-set-folding-spec-property
(unless (org-fold-core-get-folding-spec-property spec :visible)
(add-to-invisibility-spec (cons spec value)))))
(:visible
- (unless (or (memql 'merge-folds org-fold-core--optimise-for-huge-buffers)
+ (unless (or (memql 'merge-folds org-fold-core--optimize-for-huge-buffers)
(and (not force) (equal value (org-fold-core-get-folding-spec-property spec :visible))))
(if value
(remove-from-invisibility-spec (cons spec (org-fold-core-get-folding-spec-property spec :ellipsis)))
@@ -1099,7 +1099,7 @@ org-fold-core-region
(put-text-property from to (org-fold-core--property-symbol-get-create spec) spec)
(put-text-property from to 'isearch-open-invisible #'org-fold-core--isearch-show)
(put-text-property from to 'isearch-open-invisible-temporary #'org-fold-core--isearch-show-temporary)
- (when (memql 'grab-invisible org-fold-core--optimise-for-huge-buffers)
+ (when (memql 'grab-invisible org-fold-core--optimize-for-huge-buffers)
;; If the SPEC has highest priority, assign it directly
;; to 'invisible property as well. This is done to speed
;; up Emacs redisplay on huge (Mbs) folded regions where
@@ -1108,7 +1108,7 @@ org-fold-core-region
(when (eq spec (caar org-fold-core--specs)) (put-text-property from to 'invisible spec)))))
(if (not spec)
(mapc (lambda (spec) (org-fold-core-region from to nil spec)) (org-fold-core-folding-spec-list))
- (when (and (memql 'grab-invisible org-fold-core--optimise-for-huge-buffers)
+ (when (and (memql 'grab-invisible org-fold-core--optimize-for-huge-buffers)
(eq org-fold-core-style 'text-properties))
(when (eq spec (caar org-fold-core--specs))
(let ((pos from))
@@ -1394,7 +1394,7 @@ org-fold-core--fix-folded-region
;; If no insertions or deletions in buffer, skip all the checks.
(unless (or org-fold-core--ignore-modifications
(eq org-fold-core--last-buffer-chars-modified-tick (buffer-chars-modified-tick))
- (memql 'ignore-modification-checks org-fold-core--optimise-for-huge-buffers))
+ (memql 'ignore-modification-checks org-fold-core--optimize-for-huge-buffers))
;; Store the new buffer modification state.
(setq org-fold-core--last-buffer-chars-modified-tick (buffer-chars-modified-tick))
(save-match-data
@@ -1454,7 +1454,7 @@ org-fold-core--fix-folded-region
;; multiple times in indirect buffers that have exactly same
;; text anyway.
(unless (or org-fold-core--ignore-fragility-checks
- (memql 'ignore-fragility-checks org-fold-core--optimise-for-huge-buffers))
+ (memql 'ignore-fragility-checks org-fold-core--optimize-for-huge-buffers))
(dolist (func org-fold-core-extend-changed-region-functions)
(let ((new-region (funcall func from to)))
(setq from (car new-region))
@@ -1587,7 +1587,7 @@ org-fold-core--buffer-substring-filter
(let* ((prop (car plist))
(prop-name (symbol-name prop)))
;; Reveal hard-hidden text. See
- ;; `org-fold-core--optimise-for-huge-buffers'.
+ ;; `org-fold-core--optimize-for-huge-buffers'.
(when (and (eq prop 'invisible)
(member (cadr plist) (org-fold-core-folding-spec-list)))
(remove-text-properties start fin '(invisible t) return-string))
@@ -1602,10 +1602,10 @@ org-fold-core--buffer-substring-filter
(remove-text-properties 0 (length return-string) props-list return-string))
return-string))
-(defun org-fold-core-update-optimisation (beg end)
+(defun org-fold-core-update-optimization (beg end)
"Update huge buffer optimization between BEG and END.
-See `org-fold-core--optimise-for-huge-buffers'."
- (when (and (memql 'grab-invisible org-fold-core--optimise-for-huge-buffers)
+See `org-fold-core--optimize-for-huge-buffers'."
+ (when (and (memql 'grab-invisible org-fold-core--optimize-for-huge-buffers)
(eq org-fold-core-style 'text-properties))
(let ((pos beg))
(while (< pos end)
@@ -1614,11 +1614,14 @@ org-fold-core-update-optimisation
(put-text-property pos (org-fold-core-next-folding-state-change (caar org-fold-core--specs) pos end)
'invisible (caar org-fold-core--specs)))
(setq pos (org-fold-core-next-folding-state-change (caar org-fold-core--specs) pos end))))))
+(define-obsolete-function-alias
+ '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--optimise-for-huge-buffers'."
- (when (and (memql 'grab-invisible org-fold-core--optimise-for-huge-buffers)
+See `org-fold-core--optimize-for-huge-buffers'."
+ (when (and (memql 'grab-invisible org-fold-core--optimize-for-huge-buffers)
(eq org-fold-core-style 'text-properties))
(let ((pos beg))
(while (< pos end)
@@ -1627,6 +1630,9 @@ org-fold-core-remove-optimisation
(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/org-plot.el b/lisp/org/org-plot.el
index ac608bb40e8..a945b572919 100644
--- a/lisp/org/org-plot.el
+++ b/lisp/org/org-plot.el
@@ -218,13 +218,13 @@ org--plot/sensible-tick-num
(mapcar #'string-to-number (cdr row))
hard-min
hard-max)) table))
- (row-normalised-ranges (mapcar (lambda (r-data)
+ (row-normalized-ranges (mapcar (lambda (r-data)
(let ((val (round (*
(plist-get r-data :range-factor)
(plist-get r-data :nice-range)))))
(if (= (% val 10) 0) (/ val 10) val)))
row-data))
- (range-prime-decomposition (mapcar #'org--plot/prime-factors row-normalised-ranges))
+ (range-prime-decomposition (mapcar #'org--plot/prime-factors row-normalized-ranges))
(weighted-factors (sort (apply #'org--plot/merge-alists #'+ 0
(mapcar (lambda (factors) (org--plot/item-frequencies factors t))
range-prime-decomposition))
@@ -278,9 +278,9 @@ org--plot/merge-alists
(defun org--plot/item-frequencies (values &optional normalize)
"Return an alist indicating the frequency of values in VALUES list.
When NORMALIZE is non-nil, the count is divided by the number of values."
- (let ((normaliser (if normalize (float (length values)) 1)))
+ (let ((normalizer (if normalize (float (length values)) 1)))
(cl-loop for (n . m) in (seq-group-by #'identity values)
- collect (cons n (/ (length m) normaliser)))))
+ collect (cons n (/ (length m) normalizer)))))
(defun org--plot/prime-factors (value)
"Return the prime decomposition of VALUE, e.g. for 12, (3 2 2)."
diff --git a/lisp/org/org.el b/lisp/org/org.el
index 9e220b2d3df..7f91cb1bf83 100644
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -4029,7 +4029,8 @@ org-sparse-tree-default-date-type
:package-version '(Org . "8.3")
:group 'org-sparse-trees)
-(defalias 'org-advertized-archive-subtree 'org-archive-subtree)
+(define-obsolete-function-alias 'org-advertized-archive-subtree
+ #'org-archive-subtree "9.8")
;; Declare Column View Code
@@ -5898,7 +5899,7 @@ org-set-font-lock-defaults
(list org-radio-target-regexp '(0 'org-target prepend))
(list org-target-regexp '(0 'org-target prepend))
;; Macro
- '(org-fontify-macros) ; `org-fontify-macro' pepends faces
+ '(org-fontify-macros) ; `org-fontify-macro' prepends faces
;; TODO keyword
(list (format org-heading-keyword-regexp-format
org-todo-regexp)
@@ -6160,7 +6161,7 @@ org-unfontify-region
'(mouse-face t keymap t org-linked-text t
invisible t intangible t
org-emphasis t))
- (org-fold-core-update-optimisation beg end)
+ (org-fold-core-update-optimization beg end)
(org-remove-font-lock-display-properties beg end)))
(defconst org-script-display '(((raise -0.3) (height 0.7))
@@ -6567,10 +6568,10 @@ org-get-heading
(org-back-to-heading t)
(let ((case-fold-search nil))
(looking-at org-complex-heading-regexp)
- ;; When using `org-fold-core--optimise-for-huge-buffers',
+ ;; 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)
@@ -6583,7 +6584,7 @@ org-get-heading
(h h)))
(tags (and (not no-tags) (match-string 5))))
;; Restore cleared optimization.
- (org-fold-core-update-optimisation (match-beginning 0) (match-end 0))
+ (org-fold-core-update-optimization (match-beginning 0) (match-end 0))
(mapconcat #'identity
(delq nil (list todo priority headline tags))
" "))))))
@@ -6600,7 +6601,7 @@ org-heading-components
(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)))
@@ -6608,7 +6609,7 @@ org-heading-components
(and (match-end 3) (aref (match-string 3) 2))
(match-string-no-properties 4)
(match-string-no-properties 5))
- (org-fold-core-update-optimisation (match-beginning 0) (match-end 0))))))
+ (org-fold-core-update-optimization (match-beginning 0) (match-end 0))))))
(defun org-get-entry ()
"Get the entry text, after heading, entire subtree."
@@ -10696,7 +10697,7 @@ org-log-beginning
;; No drawer found. Create one, if permitted.
(when create
;; `org-end-of-meta-data' ended up at next heading
- ;; * Heading to insert darawer<maybe folded>
+ ;; * Heading to insert drawer<maybe folded>
;; * Another heading
;;
;; Unless current heading is the last heading in buffer
diff --git a/lisp/org/ox.el b/lisp/org/ox.el
index 6b62d8bae7f..24ea47a32a4 100644
--- a/lisp/org/ox.el
+++ b/lisp/org/ox.el
@@ -6425,7 +6425,7 @@ org-export-dictionary
("it" :default "Riferimenti")
("nl" :default "Bronverwijzingen")
("nn" :default "Kjelder")
- ("pl" :default "Odwołania") ; could be "Referencje" but I think its too englishy
+ ("pl" :default "Odwołania") ; could be "Referencje" but I think it's too Englishy
("pt_BR" :html "Referências" :default "Referências" :ascii "Referencias")
("ro" :default "Bibliografie")
("sl" :default "Reference")
I just installed some spelling fixes into Emacs master. Some of the
fixes apply to Org-mode, and I'm attaching them. Most of the changes are
to comments. Part of the idea is to stick with American spelling (the
Emacs style). Please integrate them into Org-mode when it's convenient.
- December 2025 spelling fixes in Org-mode Paul Eggert
- Re: December 2025 spelling fixes in Org-mode Ihor Radchenko
- Re: December 2025 spelling fixes in Org-mode Paul Eggert
- Re: December 2025 spelling fixes in Org-mode Ihor Radchenko
- Re: December 2025 spelling fixes in Org-mo... Paul Eggert
- Re: December 2025 spelling fixes in Org-mo... Christian Moe
