branch: externals/org commit 63a5af9e8e10c73b257ce376d62f84cc46746bbb Author: Lars Ingebrigtsen <la...@gnus.org> Commit: Kyle Meyer <k...@kyleam.com>
Backport commit 85e9e5f61 from Emacs * lisp/ox-html.el (org-html-htmlize-output-type): * lisp/org-agenda.el (org-agenda-do-in-region): Don't quote t and nil. Don't quote nil and t in doc strings and comments 85e9e5f616fb0fd0819a04006d6d2a0fb6d93ad7 Lars Ingebrigtsen Tue Sep 21 22:11:43 2021 +0200 --- lisp/org-agenda.el | 2 +- lisp/ox-html.el | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index 489e6c7..23c6280 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -8842,7 +8842,7 @@ Point is in the buffer where the item originated.") (defun org-agenda-do-in-region (beg end cmd &optional arg force-arg delete) "Between region BEG and END, call agenda command CMD. -When optional argument ARG is non-nil or FORCE-ARG is `t', pass +When optional argument ARG is non-nil or FORCE-ARG is t, pass ARG to CMD. When optional argument DELETE is non-nil, assume CMD deletes the agenda entry and don't move to the next entry." (save-excursion diff --git a/lisp/ox-html.el b/lisp/ox-html.el index 03145e3..d893299 100644 --- a/lisp/ox-html.el +++ b/lisp/ox-html.el @@ -874,7 +874,7 @@ link's path." (defcustom org-html-htmlize-output-type 'inline-css "Output type to be used by htmlize when formatting code snippets. Choices are `css' to export the CSS selectors only,`inline-css' -to export the CSS attribute values inline in the HTML or `nil' to +to export the CSS attribute values inline in the HTML or nil to export plain text. We use as default `inline-css', in order to make the resulting HTML self-containing.