branch: externals-release/org
commit a091ca9e663e029d55c9046eaf520e2416f97561
Merge: 5ffb2675f5 fa7d7ec3bd
Author: Kyle Meyer <k...@kyleam.com>
Commit: Kyle Meyer <k...@kyleam.com>
Merge branch 'km/from-emacs-30' into bugfix
---
doc/org-manual.org | 2 +-
etc/ORG-NEWS | 2 +-
lisp/ob-core.el | 2 +-
lisp/ob-lua.el | 20 +++++++++++---------
lisp/oc-basic.el | 2 +-
lisp/org-faces.el | 2 +-
lisp/org-indent.el | 2 +-
lisp/org.el | 2 +-
lisp/ox.el | 2 +-
9 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/doc/org-manual.org b/doc/org-manual.org
index 33f1d164d9..eb9ab5ead0 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/etc/ORG-NEWS b/etc/ORG-NEWS
index 21db8f43d4..bbf26d9515 100644
--- a/etc/ORG-NEWS
+++ b/etc/ORG-NEWS
@@ -180,7 +180,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/ob-lua.el b/lisp/ob-lua.el
index 041abfabcd..980a710953 100644
--- a/lisp/ob-lua.el
+++ b/lisp/ob-lua.el
@@ -23,12 +23,14 @@
;;; Commentary:
-;; Org-Babel support for evaluating lua source code.
+;; Org-Babel support for evaluating Lua source code.
;; Requirements:
;; for session support, lua-mode is needed.
+;;
;; lua-mode is not part of GNU Emacs/orgmode, but can be obtained
-;; from marmalade or melpa.
+;; from NonGNU ELPA (see `M-x list-packages').
+;;
;; The source repository is here:
;; https://github.com/immerrr/lua-mode
@@ -68,14 +70,14 @@ This will typically be `lua-mode'."
:type 'symbol)
(defcustom org-babel-lua-hline-to "None"
- "Replace hlines in incoming tables with this when translating to lua."
+ "Replace hlines in incoming tables with this when translating to Lua."
:group 'org-babel
:version "26.1"
:package-version '(Org . "8.3")
:type 'string)
(defcustom org-babel-lua-None-to 'hline
- "Replace `None' in lua tables with this before returning."
+ "Replace `None' in Lua tables with this before returning."
:group 'org-babel
:version "26.1"
:package-version '(Org . "8.3")
@@ -145,8 +147,8 @@ The variable definitions are defining in PARAMS."
(org-babel--get-vars params)))
(defun org-babel-lua-var-to-lua (var)
- "Convert an elisp value to a lua variable.
-Convert an elisp value, VAR, into a string of lua source code
+ "Convert an Emacs Lisp value to a Lua variable.
+Convert an Emacs Lisp value, VAR, into a string of Lua source code
specifying a variable of the same value."
(if (listp var)
(if (and (= 1 (length var)) (not (listp (car var))))
@@ -207,7 +209,7 @@ Emacs-lisp table, otherwise return the results as a string."
(defvar lua-which-bufname)
(defvar lua-shell-buffer-name)
(defun org-babel-lua-initiate-session-by-key (&optional session)
- "Initiate a lua session.
+ "Initiate a Lua session.
If there is not a current inferior-process-buffer in SESSION
then create. Return the initialized session."
;; (require org-babel-lua-mode)
@@ -317,7 +319,7 @@ PREAMBLE is passed to
`org-babel-lua-evaluate-external-process'."
"Evaluate BODY in external Lua process.
If RESULT-TYPE equals `output' then return standard output as a
string. If RESULT-TYPE equals `value' then return the value of the
-last statement in BODY, as elisp.
+last statement in BODY, as Emacs Lisp.
RESULT-PARAMS list all the :result header arg parameters.
PREAMBLE string is appended to BODY."
(let ((raw
@@ -353,7 +355,7 @@ PREAMBLE string is appended to BODY."
"Pass BODY to the Lua process in SESSION.
If RESULT-TYPE equals `output' then return standard output as a
string. If RESULT-TYPE equals `value' then return the value of the
-last statement in BODY, as elisp."
+last statement in BODY, as Emacs Lisp."
(let* ((send-wait (lambda () (comint-send-input nil t) (sleep-for 0.005)))
(dump-last-value
(lambda
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 790ed28253..718d53d641 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -15435,7 +15435,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
