From 5d7218ceffbef573d2113eca0dc3689411d995fd Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Sun, 16 Jun 2024 21:59:42 +0200 Subject: [PATCH] Backport commit c0eefebab from Emacs ; Fix typos c0eefebabfee011f0ec7631d055e482e4965a24d Stefan Kangas Sun Jun 16 22:38:26 2024 +0200 --- doc/org-manual.org | 2 +- lisp/oc-basic.el | 2 +- lisp/org-faces.el | 2 +- lisp/ox.el | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/org-manual.org b/doc/org-manual.org index 170eea506..06ade0b2d 100644 --- a/doc/org-manual.org +++ b/doc/org-manual.org @@ -16408,7 +16408,7 @@ The iCalendar format standard requires globally unique identifier---or UID---for each entry. The iCalendar export backend creates UIDs during export. To save a copy of the UID in the Org file set the variable ~org-icalendar-store-UID~. The backend looks for the =ID= -property of the entry for re-using the same UID for subsequent +property of the entry for reusing the same UID for subsequent exports. Since a single Org entry can result in multiple iCalendar diff --git a/lisp/oc-basic.el b/lisp/oc-basic.el index 6e3142fa1..e207a1997 100644 --- a/lisp/oc-basic.el +++ b/lisp/oc-basic.el @@ -24,7 +24,7 @@ ;; The `basic' citation processor provides "activate", "follow", "export" and ;; "insert" capabilities. -;; "activate" capability re-uses default fontification, but provides additional +;; "activate" capability reuses default fontification, but provides additional ;; features on both correct and wrong keys according to the bibliography ;; defined in the document. diff --git a/lisp/org-faces.el b/lisp/org-faces.el index af7269bd1..785fb22db 100644 --- a/lisp/org-faces.el +++ b/lisp/org-faces.el @@ -683,7 +683,7 @@ month and 365.24 days for a year)." (defcustom org-n-level-faces (length org-level-faces) "The number of different faces to be used for headlines. Org mode defines 8 different headline faces, so this can be at most 8. -If it is less than 8, the level-1 face gets re-used for level N+1 etc." +If it is less than 8, the level-1 face gets reused for level N+1 etc." :type 'integer :group 'org-faces) diff --git a/lisp/ox.el b/lisp/ox.el index 35bbf84a0..6fa21be90 100644 --- a/lisp/ox.el +++ b/lisp/ox.el @@ -4738,7 +4738,7 @@ matching DATUM before creating a new reference." ;; unique, e.g., there might be duplicate custom ID or ;; two headings with the same title in the file. ;; - ;; As a consequence, before re-using any reference to + ;; As a consequence, before reusing any reference to ;; an element or object, we check that it doesn't refer ;; to a previous element or object. (new (or (cl-some