mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-08-26 02:32:52 +00:00
Merge branch 'km/from-emacs-29' into bugfix
This commit is contained in:
commit
3cdb637fcf
|
@ -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
|
||||
|
|
|
@ -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'.
|
||||
|
||||
|
|
|
@ -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.
|
||||
|
||||
|
|
|
@ -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?
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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)))
|
||||
|
|
|
@ -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."
|
||||
|
|
Loading…
Reference in a new issue