branch: externals/org
commit 739380371609a09bed238ec21dd484d52dcd86c3
Merge: 84f9d81abc e666660c7d
Author: Ihor Radchenko <yanta...@posteo.net>
Commit: Ihor Radchenko <yanta...@posteo.net>
Merge branch 'bugfix'
---
etc/ORG-NEWS | 16 ++++++++--------
lisp/ob-clojure.el | 2 +-
lisp/ob-core.el | 2 +-
lisp/ob-lilypond.el | 2 +-
lisp/ob-shell.el | 4 ++--
lisp/org-element.el | 28 ++++++++++++++--------------
lisp/org-persist.el | 4 ++--
lisp/org-src.el | 4 ++--
lisp/ox.el | 2 +-
9 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS
index 483a1c0c73..e2cacb4012 100644
--- a/etc/ORG-NEWS
+++ b/etc/ORG-NEWS
@@ -360,7 +360,7 @@ passing universal argument.
When using this feature, IDs should not include =::=, which is used in
links to indicate the start of the search string. For backwards
-compability, existing IDs including =::= will still be matched (but
+compatibility, existing IDs including =::= will still be matched (but
cannot be used together with search option). A new org-lint checker
has been added to warn about this.
@@ -501,8 +501,8 @@ in the dynamic block.
A global default formatting function for =colview= dynamic blocks can
be set via the new option ~org-columns-dblock-formatter~ which
defaults to the new function ~org-columns-dblock-write-default~, that
-implements the previous (fixed) formatting behaviour. Hence, the
-default behaviour is identical to previous versions.
+implements the previous (fixed) formatting behavior. Hence, the
+default behavior is identical to previous versions.
The global default function can be overridden for any given =colview=
dynamic block individually by specifying a custom formatter function
@@ -968,7 +968,7 @@ order to remain backward-compatible.
Before, a ClojureScript source block used the same backend as Clojure,
configured in ~org-babel-clojure-backend~ and relied on an undocumented
-~:target~ paramter.
+~:target~ parameter.
Now, there's ~org-babel-clojurescript-backend~ to determine the
backend used for evaluation of ClojureScript.
@@ -1046,7 +1046,7 @@ manner with ~run-python~.
*** New hook option ~org-indent-post-buffer-init-functions~
-This allows to run functions after ~org-indent~ intializes a buffer to
+This allows to run functions after ~org-indent~ initializes a buffer to
enrich its properties.
*** New option ~org-agenda-start-with-archives-mode~
@@ -1109,7 +1109,7 @@ of the dynamic block. This new option can be used to set
the global
default formatting function that will be used for =colview= dynamic
blocks that do not specify any ~:formatter~ parameter. Its default
value (the new function ~org-columns-dblock-write-default~) yields the
-previous (fixed) formatting behaviour.
+previous (fixed) formatting behavior.
*** New allowed value of ~org-md-headline-style~ to mix ATX and Setext style
headlines
@@ -1653,12 +1653,12 @@ is initiated only when user explicitly executes
R/Julia-mode commands
that trigger session interactions (requires ESS 24.01.0 or newer).
The same session will remain available in the context of Org babel.
-*** ~org-store-link~ behaviour storing additional =CUSTOM_ID= links has changed
+*** ~org-store-link~ behavior storing additional =CUSTOM_ID= links has changed
Previously, when storing =id:= link, ~org-store-link~ stored an
additional "human readable" link using a node's =CUSTOM_ID= property.
-This behaviour has been expanded to store an additional =CUSTOM_ID=
+This behavior has been expanded to store an additional =CUSTOM_ID=
link when storing any type of external link type in an Org file, not
just =id:= links.
diff --git a/lisp/ob-clojure.el b/lisp/ob-clojure.el
index 4a54acc51b..c7ebbbb95e 100644
--- a/lisp/ob-clojure.el
+++ b/lisp/ob-clojure.el
@@ -130,7 +130,7 @@
(defcustom ob-clojure-cli-command (when-let (cmd (executable-find "clojure"))
(concat cmd " -M"))
"Clojure CLI command used by the Clojure `clojure-cli' backend."
- :type 'string
+ :type '(choice string (const nil))
:group 'org-babel
:package-version '(Org . "9.7"))
diff --git a/lisp/ob-core.el b/lisp/ob-core.el
index 0b329266a5..db75f1f0ad 100644
--- a/lisp/ob-core.el
+++ b/lisp/ob-core.el
@@ -2762,7 +2762,7 @@ INFO may provide the values of these header arguments (in
the
;; In this case `table-align' does the work
;; for us.
(not (and (listp result)
- (member "append" result-params))))
+ (member "append" result-params))))
(indent-rigidly beg end indent))
(unless noninteractive
(let ((time-info
diff --git a/lisp/ob-lilypond.el b/lisp/ob-lilypond.el
index 35df76fc96..a8d85ce7c8 100644
--- a/lisp/ob-lilypond.el
+++ b/lisp/ob-lilypond.el
@@ -41,7 +41,7 @@
(declare-function org-fold-show-all "org-fold" (&optional types))
(add-to-list 'org-babel-tangle-lang-exts '("LilyPond" . "ly"))
-(add-to-list 'org-src-lang-modes '("lilypond" . "LilyPond"))
+(add-to-list 'org-src-lang-modes '("lilypond" . LilyPond))
(defvar org-babel-default-header-args:lilypond '()
"Default header arguments for lilypond code blocks.
diff --git a/lisp/ob-shell.el b/lisp/ob-shell.el
index 35d9e93761..2304c7ec9c 100644
--- a/lisp/ob-shell.el
+++ b/lisp/ob-shell.el
@@ -92,10 +92,10 @@ variables."
name))
(funcall (if (fboundp 'defvar-1) #'defvar-1 #'set) ;Emacs-29
(intern (concat "org-babel-default-header-args:" name))
- nil)
+ org-babel-default-header-args:shell)
(funcall (if (fboundp 'defvar-1) #'defvar-1 #'set) ;Emacs-29
(intern (concat "org-babel-header-args:" name))
- nil)))
+ org-babel-header-args:shell)))
(defcustom org-babel-shell-names
'("sh" "bash" "zsh" "fish" "csh" "ash" "dash" "ksh" "mksh" "posh")
diff --git a/lisp/org-element.el b/lisp/org-element.el
index b15f0b69d9..191bb5698d 100644
--- a/lisp/org-element.el
+++ b/lisp/org-element.el
@@ -1188,7 +1188,7 @@ parse properties for property drawer at point."
(property-name-symbol (intern property-name))
(property-value
(org-element-deferred-create
- nil #'org-element--substring
+ t #'org-element--substring
(- (match-beginning 3) begin)
(- (match-end 3) begin))))
(cond
@@ -1355,7 +1355,7 @@ Throw `:org-element-deferred-retry' signal at the end."
(title-end (point))
(raw-value
(org-element-deferred-create
- nil #'org-element--headline-raw-value
+ t #'org-element--headline-raw-value
(- title-start begin) (- title-end begin))))
(org-element-put-property headline :raw-value raw-value)
(org-element-put-property headline :level level)
@@ -1386,12 +1386,12 @@ Throw `:org-element-deferred-retry' signal at the end."
(defconst org-element--headline-parse-title-raw
(org-element-deferred-create
- nil #'org-element--headline-parse-title t)
+ t #'org-element--headline-parse-title t)
"Constant holding deferred value for raw headline `:title' property.")
(defconst org-element--headline-parse-title-parse
(org-element-deferred-create
- nil #'org-element--headline-parse-title nil)
+ t #'org-element--headline-parse-title nil)
"Constant holding deferred value for parsed headline `:title' property.")
(defconst org-element--headline-deferred
@@ -2414,7 +2414,7 @@ Assume point is at comment block beginning."
(if (eobp) (point) (line-beginning-position))))
(value
(org-element-deferred-create
- nil #'org-element--substring
+ t #'org-element--substring
(- contents-begin begin)
(- contents-end begin))))
(org-element-create
@@ -2532,7 +2532,7 @@ Return a new syntax node of `example-block' type
containing `:begin',
(contents-begin (line-beginning-position 2))
(value
(org-element-deferred-create
- nil #'org-element--unescape-substring
+ t #'org-element--unescape-substring
(- contents-begin begin)
(- contents-end begin)))
(pos-before-blank (progn (goto-char contents-end)
@@ -2612,7 +2612,7 @@ Assume point is at export-block beginning."
(if (eobp) (point) (line-beginning-position))))
(value
(org-element-deferred-create
- nil #'org-element--unescape-substring
+ t #'org-element--unescape-substring
(- contents-begin begin)
(- contents-end begin))))
(org-element-create
@@ -2800,7 +2800,7 @@ Assume point is at the beginning of the latex
environment."
(begin (car affiliated))
(value
(org-element-deferred-create
- nil #'org-element--substring
+ t #'org-element--substring
(- code-begin begin)
(- code-end begin)))
(end (progn (skip-chars-forward " \r\t\n" limit)
@@ -3059,7 +3059,7 @@ Assume point is at the beginning of the block."
;; Retrieve code.
(value
(org-element-deferred-create
- nil #'org-element--unescape-substring
+ t #'org-element--unescape-substring
(- (line-beginning-position 2) begin)
(- contents-end begin)))
(pos-before-blank (progn (goto-char contents-end)
@@ -3159,7 +3159,7 @@ Assume point is at the beginning of the table."
:contents-end (and (eq type 'org) table-end)
:value (and (eq type 'table.el)
(org-element-deferred-create
- nil #'org-element--substring
+ t #'org-element--substring
(- table-begin begin)
(- table-end begin)))
:post-blank (count-lines pos-before-blank end)
@@ -3322,7 +3322,7 @@ Assume point is at first MARK."
(list :value
(and (memq type '(code verbatim))
(org-element-deferred-create
- nil #'org-element--substring
+ t #'org-element--substring
(- contents-begin origin)
(- contents-end origin))))
(list :contents-begin contents-begin
@@ -3572,7 +3572,7 @@ Assume point is at the beginning of the snippet."
(value
(when contents-end
(org-element-deferred-create
- nil #'org-element--substring
+ t #'org-element--substring
(- contents-begin begin)
(- contents-end begin))))
(post-blank (skip-chars-forward " \t"))
@@ -3667,7 +3667,7 @@ Assume point is at the beginning of the babel call."
(replace-regexp-in-string "\n[ \t]*" " " (org-trim p)))))
(value
(org-element-deferred-create
- nil #'org-element--substring
+ t #'org-element--substring
0 (- (point) begin)))
(post-blank (skip-chars-forward " \t"))
(end (point)))
@@ -3801,7 +3801,7 @@ Assume point is at the beginning of the LaTeX fragment."
'latex-fragment
(list :value
(org-element-deferred-create
- nil #'org-element--substring
+ t #'org-element--substring
0 (- after-fragment begin))
:begin begin
:end end
diff --git a/lisp/org-persist.el b/lisp/org-persist.el
index c855c6604b..52f4b0eef2 100644
--- a/lisp/org-persist.el
+++ b/lisp/org-persist.el
@@ -416,7 +416,7 @@ FORMAT and ARGS are passed to `message'."
(defun org-persist--read-elisp-file (&optional buffer-or-file)
"Read elisp data from BUFFER-OR-FILE or current buffer."
(let (;; UTF-8 is explicitly used in `org-persist--write-elisp-file'.
- (coding-system-for-read 'utf-8)
+ (coding-system-for-read 'emacs-internal)
(buffer-or-file (or buffer-or-file (current-buffer))))
(with-temp-buffer
(if (bufferp buffer-or-file)
@@ -464,7 +464,7 @@ FORMAT and ARGS are passed to `message'."
(let ((write-region-inhibit-fsync t)
;; We set UTF-8 here and in `org-persist--read-elisp-file'
;; to avoid the overhead from `find-auto-coding'.
- (coding-system-for-write 'utf-8)
+ (coding-system-for-write 'emacs-internal)
(print-circle (not no-circular))
print-level
print-length
diff --git a/lisp/org-src.el b/lisp/org-src.el
index d152fbfe8b..262bd46281 100644
--- a/lisp/org-src.el
+++ b/lisp/org-src.el
@@ -241,8 +241,8 @@ but the mode to use is `tuareg-mode'."
:package-version '(Org . "9.7")
:type '(repeat
(cons
- (string "Language name")
- (symbol "Major mode"))))
+ (string :tag "Language name")
+ (symbol :tag "Major mode"))))
(defcustom org-src-block-faces nil
"Alist of faces to be used for source-block.
diff --git a/lisp/ox.el b/lisp/ox.el
index 29390bf0e4..35bbf84a0c 100644
--- a/lisp/ox.el
+++ b/lisp/ox.el
@@ -6671,7 +6671,7 @@ and `org-export-to-file' for more specialized functions."
(with-temp-message "Initializing asynchronous export process"
(let ((copy-fun (org-element--generate-copy-script (current-buffer)))
(temp-file (make-temp-file "org-export-process")))
- (let ((coding-system-for-write 'utf-8-emacs-unix))
+ (let ((coding-system-for-write 'emacs-internal))
(write-region
;; Null characters (from variable values) are inserted
;; within the file. As a consequence, coding system for
