mirrors/org-mode
0
0
Fork 1
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-08-26 04:32:52 +00:00
Code Releases Activity

Merge branch 'km/from-emacs-29' into bugfix

Browse source
This commit is contained in:
Kyle Meyer 2023-12-04 23:27:04 -05:00
parent a5e3a06b2e dc1230a3b5
commit 3cdb637fcf
9 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
etc/ORG-NEWS
View file

@ -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 give the user full control over the contents of the latex source
block. ~org-babel-latex-preamble~, ~org-babel-latex-begin-env~ and block. ~org-babel-latex-preamble~, ~org-babel-latex-begin-env~ and
~org-babel-latex-end-env~ are new customization options added to allow ~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. the contents of the source block.
*** New option ~org-html-meta-tags~ allows for HTML meta tags customization *** New option ~org-html-meta-tags~ allows for HTML meta tags customization

2
lisp/oc-biblatex.el
View file

@ -26,7 +26,7 @@
;; The processor relies on "biblatex" LaTeX package. As such it ensures that ;; The processor relies on "biblatex" LaTeX package. As such it ensures that
;; the package is properly required in the document's preamble. More ;; 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 ;; the document (e.g., through `org-latex-packages-alist'), or insert one using
;; options defined in `org-cite-biblatex-options'. ;; options defined in `org-cite-biblatex-options'.

2
lisp/oc.el
View file

@ -52,7 +52,7 @@
;; through the "cite_export" keyword. ;; through the "cite_export" keyword.
;; Eventually, this library provides some tools, mainly targeted at ;; 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 ;; in the "Tools only available during export" and "Tools generating
;; or operating on parsed data" sections. ;; or operating on parsed data" sections.

2
lisp/org-capture.el
View file

@ -1312,7 +1312,7 @@ may have been stored before."
(while (< (point) end) (while (< (point) end)
(indent-to i) (indent-to i)
(forward-line))) (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, ;; if there is a mismatch. In this situation,
;; prioritize the existing list. ;; prioritize the existing list.
(when prepend? (when prepend?

2
lisp/org-compat.el
View file

@ -141,7 +141,7 @@ Unibyte strings are converted to multibyte for comparison."
Elements in COMPONENTS must be a string or nil. Elements in COMPONENTS must be a string or nil.
DIRECTORY or the non-final elements in COMPONENTS may or may not end 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 with a slash -- if they don't end with a slash, a slash will be
inserted before contatenating." inserted before concatenating."
(save-match-data (save-match-data
(mapconcat (mapconcat
#'identity #'identity

2
lisp/org-element.el
View file

@ -5484,7 +5484,7 @@ This variable is used to determine when re-parsing buffer is not going
to slow down the command. to slow down the command.
If the commands end up modifying the cache, the worst case scenario is 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.") better to remove the commands advised in such a way from this list.")
(defmacro org-element--request-key (request) (defmacro org-element--request-key (request)

4
lisp/org-persist.el
View file

@ -111,7 +111,7 @@
;; ;;
;; Each collection is represented as a plist containing the following ;; Each collection is represented as a plist containing the following
;; properties: ;; properties:
;; - `:container' : list of data continers to be stored in single ;; - `:container' : list of data containers to be stored in single
;; file; ;; file;
;; - `:persist-file': data file name; ;; - `:persist-file': data file name;
;; - `:associated' : list of associated objects; ;; - `: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 persistent data storage. Each plist contains the following
properties: 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 - `:persist-file': data file name
- `:associated' : list of associated objects - `:associated' : list of associated objects
- `:last-access' : last date when the container has been read - `:last-access' : last date when the container has been read

2
lisp/org-table.el
View file

@ -4894,7 +4894,7 @@ This function sets up the following dynamically scoped variables:
(push (cons field v) org-table-local-parameters) (push (cons field v) org-table-local-parameters)
(push (list field line col) (push (list field line col)
org-table-named-field-locations)))))))))) org-table-named-field-locations))))))))))
;; Re-use existing markers when possible. ;; Reuse existing markers when possible.
(if (markerp org-table-current-begin-pos) (if (markerp org-table-current-begin-pos)
(move-marker org-table-current-begin-pos (point)) (move-marker org-table-current-begin-pos (point))
(setq org-table-current-begin-pos (point-marker))) (setq org-table-current-begin-pos (point-marker)))

4
lisp/org.el
View file

@ -1230,7 +1230,7 @@ This applies to indirect buffers created with the commands
Valid values are: Valid values are:
current-window Display in the current window current-window Display in the current window
other-window Just display in another 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 new-frame Make a new frame each time. Note that in this case
previously-made indirect buffers are kept, and you need to previously-made indirect buffers are kept, and you need to
kill these buffers yourself." kill these buffers yourself."
@ -4582,7 +4582,7 @@ is available. This option applies only if FILE is a URL."
file) file)
nil)) nil))
(error (if noerror (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))))) (signal (car error) (cdr error)))))
(funcall (if noerror #'message #'user-error) (funcall (if noerror #'message #'user-error)
"The remote resource %S is considered unsafe, and will not be downloaded." "The remote resource %S is considered unsafe, and will not be downloaded."