branch: externals/org commit 263f337598ac5165f2b2bd2e11238e5fdc87ba1f Author: Sean Whitton <spwhit...@spwhitton.name> Commit: Kyle Meyer <k...@kyleam.com>
Backport commit 60c0524ad from Emacs * lisp/org-capture.el (org-capture): * lisp/org.el (org-category, org-todo): * lisp/ox.el (org-export-async-start): Fix capitalization ELisp -> Elisp. Fix capitalization ELisp -> Elisp 60c0524ad28eaeae968603010831bcacca2a5180 Sean Whitton Wed Mar 12 09:38:33 2025 +0800 [ km: This was independently covered on the bugfix branch with f86e17e38. It's applied here for bookkeeping/traceability purposes. ] --- lisp/org-capture.el | 2 +- lisp/org.el | 8 ++++---- lisp/ox.el | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lisp/org-capture.el b/lisp/org-capture.el index d4ae0207c3..9f737893e6 100644 --- a/lisp/org-capture.el +++ b/lisp/org-capture.el @@ -658,7 +658,7 @@ When called with a `C-0' (zero) prefix, insert a template at point. When called with a `C-1' (one) prefix, force prompting for a date when a datetree entry is made. -ELisp programs can set KEYS to a string associated with a template +Elisp programs can set KEYS to a string associated with a template in `org-capture-templates'. In this case, interactive selection will be bypassed. diff --git a/lisp/org.el b/lisp/org.el index 56a8d11e1a..9051bf6c8c 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -3157,16 +3157,16 @@ There are multiple ways to set the category. One way is to set it in the document property drawer. For example: :PROPERTIES: -:CATEGORY: ELisp +:CATEGORY: Elisp :END: Other ways to define it is as an Emacs file variable, for example -# -*- mode: org; org-category: \"ELisp\" +# -*- mode: org; org-category: \"Elisp\" or for the file to contain a special line: -#+CATEGORY: ELisp +#+CATEGORY: Elisp If the file does not specify a category, then file's base name is used instead.") @@ -9422,7 +9422,7 @@ With numeric prefix arg, switch to the Nth state. With a numeric prefix arg of 0, inhibit note taking for the change. With a numeric prefix arg of -1, cancel repeater to allow marking as DONE. -When called through ELisp, arg is also interpreted in the following way: +When called through Elisp, arg is also interpreted in the following way: `none' -> empty state \"\" -> switch to empty state `done' -> switch to DONE diff --git a/lisp/ox.el b/lisp/ox.el index a2a21a72c4..6b62d8bae7 100644 --- a/lisp/ox.el +++ b/lisp/ox.el @@ -6660,7 +6660,7 @@ to `:default' encoding. If it fails, return S." "Call function FUN on the results returned by BODY evaluation. FUN is an anonymous function of one argument. BODY should be a valid -ELisp source expression. BODY evaluation happens in an asynchronous process, +Elisp source expression. BODY evaluation happens in an asynchronous process, from a buffer which is an exact copy of the current one. Use `org-export-add-to-stack' in FUN in order to register results