[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals-release/org 3cdb637fcf 2/2: Merge branch 'km/from-emacs
From: |
ELPA Syncer |
Subject: |
[elpa] externals-release/org 3cdb637fcf 2/2: Merge branch 'km/from-emacs-29' into bugfix |
Date: |
Tue, 5 Dec 2023 00:58:33 -0500 (EST) |
branch: externals-release/org
commit 3cdb637fcffc36bad336aed0f2b346443872d03a
Merge: a5e3a06b2e dc1230a3b5
Author: Kyle Meyer <kyle@kyleam.com>
Commit: Kyle Meyer <kyle@kyleam.com>
Merge branch 'km/from-emacs-29' into bugfix
---
etc/ORG-NEWS | 2 +-
lisp/oc-biblatex.el | 2 +-
lisp/oc.el | 2 +-
lisp/org-capture.el | 2 +-
lisp/org-compat.el | 2 +-
lisp/org-element.el | 2 +-
lisp/org-persist.el | 4 ++--
lisp/org-table.el | 2 +-
lisp/org.el | 4 ++--
9 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS
index 5f92c05601..1e87f10748 100644
--- a/etc/ORG-NEWS
+++ b/etc/ORG-NEWS
@@ -1098,7 +1098,7 @@ Conversion to SVG exposes a number of additional
customizations that
give the user full control over the contents of the latex source
block. ~org-babel-latex-preamble~, ~org-babel-latex-begin-env~ and
~org-babel-latex-end-env~ are new customization options added to allow
-the user to specify the preamble and code that preceedes and proceeds
+the user to specify the preamble and code that precedes and proceeds
the contents of the source block.
*** New option ~org-html-meta-tags~ allows for HTML meta tags customization
diff --git a/lisp/oc-biblatex.el b/lisp/oc-biblatex.el
index b2d31f0f63..0ed5459a66 100644
--- a/lisp/oc-biblatex.el
+++ b/lisp/oc-biblatex.el
@@ -26,7 +26,7 @@
;; The processor relies on "biblatex" LaTeX package. As such it ensures that
;; the package is properly required in the document's preamble. More
-;; accurately, it will re-use any "\usepackage{biblatex}" already present in
+;; accurately, it will reuse any "\usepackage{biblatex}" already present in
;; the document (e.g., through `org-latex-packages-alist'), or insert one using
;; options defined in `org-cite-biblatex-options'.
diff --git a/lisp/oc.el b/lisp/oc.el
index 8a7b662098..269f7fd13a 100644
--- a/lisp/oc.el
+++ b/lisp/oc.el
@@ -52,7 +52,7 @@
;; through the "cite_export" keyword.
;; Eventually, this library provides some tools, mainly targeted at
-;; processor implementors. Most are export-specific and are located
+;; processor implementers. Most are export-specific and are located
;; in the "Tools only available during export" and "Tools generating
;; or operating on parsed data" sections.
diff --git a/lisp/org-capture.el b/lisp/org-capture.el
index a696c615b2..41872ff87e 100644
--- a/lisp/org-capture.el
+++ b/lisp/org-capture.el
@@ -1312,7 +1312,7 @@ may have been stored before."
(while (< (point) end)
(indent-to i)
(forward-line)))
- ;; Pre-pending an item could change the type of the list
+ ;; Prepending an item could change the type of the list
;; if there is a mismatch. In this situation,
;; prioritize the existing list.
(when prepend?
diff --git a/lisp/org-compat.el b/lisp/org-compat.el
index d5bf2191ae..db5e9283bf 100644
--- a/lisp/org-compat.el
+++ b/lisp/org-compat.el
@@ -141,7 +141,7 @@ Unibyte strings are converted to multibyte for comparison."
Elements in COMPONENTS must be a string or nil.
DIRECTORY or the non-final elements in COMPONENTS may or may not end
with a slash -- if they don't end with a slash, a slash will be
-inserted before contatenating."
+inserted before concatenating."
(save-match-data
(mapconcat
#'identity
diff --git a/lisp/org-element.el b/lisp/org-element.el
index a790a6528b..44694d7308 100644
--- a/lisp/org-element.el
+++ b/lisp/org-element.el
@@ -5484,7 +5484,7 @@ This variable is used to determine when re-parsing buffer
is not going
to slow down the command.
If the commands end up modifying the cache, the worst case scenario is
-performance drop. So, advicing these commands is safe. Yet, it is
+performance drop. So, advising these commands is safe. Yet, it is
better to remove the commands advised in such a way from this list.")
(defmacro org-element--request-key (request)
diff --git a/lisp/org-persist.el b/lisp/org-persist.el
index 65e9f4b7f1..59ef2ac27a 100644
--- a/lisp/org-persist.el
+++ b/lisp/org-persist.el
@@ -111,7 +111,7 @@
;;
;; Each collection is represented as a plist containing the following
;; properties:
-;; - `:container' : list of data continers to be stored in single
+;; - `:container' : list of data containers to be stored in single
;; file;
;; - `:persist-file': data file name;
;; - `:associated' : list of associated objects;
@@ -253,7 +253,7 @@ The index is a list of plists. Each plist contains
information about
persistent data storage. Each plist contains the following
properties:
- - `:container' : list of data continers to be stored in single file
+ - `:container' : list of data containers to be stored in single file
- `:persist-file': data file name
- `:associated' : list of associated objects
- `:last-access' : last date when the container has been read
diff --git a/lisp/org-table.el b/lisp/org-table.el
index fd10ccf576..eb4da2c3a7 100644
--- a/lisp/org-table.el
+++ b/lisp/org-table.el
@@ -4894,7 +4894,7 @@ This function sets up the following dynamically scoped
variables:
(push (cons field v) org-table-local-parameters)
(push (list field line col)
org-table-named-field-locations))))))))))
- ;; Re-use existing markers when possible.
+ ;; Reuse existing markers when possible.
(if (markerp org-table-current-begin-pos)
(move-marker org-table-current-begin-pos (point))
(setq org-table-current-begin-pos (point-marker)))
diff --git a/lisp/org.el b/lisp/org.el
index 34932858d2..c728560041 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -1230,7 +1230,7 @@ This applies to indirect buffers created with the commands
Valid values are:
current-window Display in the current window
other-window Just display in another window.
-dedicated-frame Create one new frame, and re-use it each time.
+dedicated-frame Create one new frame, and reuse it each time.
new-frame Make a new frame each time. Note that in this case
previously-made indirect buffers are kept, and you need to
kill these buffers yourself."
@@ -4582,7 +4582,7 @@ is available. This option applies only if FILE is a URL."
file)
nil))
(error (if noerror
- (message "Org could't download \"%s\": %s %S" file (car
error) (cdr error))
+ (message "Org couldn't download \"%s\": %s %S" file
(car error) (cdr error))
(signal (car error) (cdr error)))))
(funcall (if noerror #'message #'user-error)
"The remote resource %S is considered unsafe, and will not be
downloaded."
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [elpa] externals-release/org 3cdb637fcf 2/2: Merge branch 'km/from-emacs-29' into bugfix,
ELPA Syncer <=