branch: externals/org commit d6c0bbe280bf4ece9068e106437ad709d730acb3 Merge: b64dbd838f 7a45270b11 Author: Ihor Radchenko <yanta...@posteo.net> Commit: Ihor Radchenko <yanta...@posteo.net>
Merge branch 'bugfix' --- doc/org-manual.org | 2 +- etc/ORG-NEWS | 2 +- lisp/ob-core.el | 2 +- lisp/oc-basic.el | 2 +- lisp/org-faces.el | 2 +- lisp/org-indent.el | 2 +- lisp/org.el | 2 +- lisp/ox.el | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/doc/org-manual.org b/doc/org-manual.org index ffa334c860..d30c18e0c7 100644 --- a/doc/org-manual.org +++ b/doc/org-manual.org @@ -16435,7 +16435,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/etc/ORG-NEWS b/etc/ORG-NEWS index 7c6ac5efc8..b9f51667d9 100644 --- a/etc/ORG-NEWS +++ b/etc/ORG-NEWS @@ -290,7 +290,7 @@ Previously, when exporting to Org, all the citations and =print_bibliography= keywords, were transformed according to the chosen citation processor. -This is no loner the case. All the citation-related markup is now +This is no longer the case. All the citation-related markup is now exported as is. The previous behavior can be reverted by setting new custom option diff --git a/lisp/ob-core.el b/lisp/ob-core.el index 5b32f503b1..727ace8446 100644 --- a/lisp/ob-core.el +++ b/lisp/ob-core.el @@ -2861,7 +2861,7 @@ file's directory then expand relative links. If the optional TYPE is passed as `attachment' and the path is a descendant of the DEFAULT-DIRECTORY, the generated link will be -specified as an an \"attachment:\" style link." +specified as an \"attachment:\" style link." (when (stringp result) (let* ((result-file-name (expand-file-name result)) (base-file-name (buffer-file-name (buffer-base-buffer))) diff --git a/lisp/oc-basic.el b/lisp/oc-basic.el index 6e3142fa12..e207a19977 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 af7269bd15..785fb22dbc 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/org-indent.el b/lisp/org-indent.el index 39dda4332a..cabed6acf7 100644 --- a/lisp/org-indent.el +++ b/lisp/org-indent.el @@ -105,7 +105,7 @@ For details see the variable `org-adapt-indentation'." (defcustom org-indent-post-buffer-init-functions nil "Hook run after org-indent finishes initializing a buffer. -The function(s) in in this hook must accept a single argument representing +The function(s) in this hook must accept a single argument representing the initialized buffer." :group 'org-indent :package-version '(Org . "9.7") diff --git a/lisp/org.el b/lisp/org.el index a627b9e6ee..f4abfa676f 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -15438,7 +15438,7 @@ When SUPPRESS-TMP-DELAY is non-nil, suppress delays like (defun org-modify-ts-extra (ts-string pos nincrements increment-step) "Change the lead-time/repeat fields at POS in timestamp string TS-STRING. POS is the position in the timestamp string to be changed. -NINCREMENTS is the number of incremenets/decrements. +NINCREMENTS is the number of increments/decrements. INCREMENT-STEP is step used for a single increment when POS in on minutes. Before incrementing minutes, they are rounded to diff --git a/lisp/ox.el b/lisp/ox.el index 35bbf84a0c..6fa21be906 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