Porting from Emacs's master to Org's maint branch has been on hold
leading up to the Emacs 27.2 release to avoid any required fixup syncs
carrying those commits into the emacs-27 branch. This merge brings
those changes into master. The km/from-emacs-master branch should be
merged to maint when Emacs 27.2 has been released (assuming Org 9.5
hasn't been released, in which case maint will be tracking 9.5.x and
already include these changes).
* lisp/org-macs.el (org-matcher-time): Handle hour ("h") time stamp
modifier.
* doc/org-manual.org (The date/time prompt): Document hour modifier.
This adds support for date expressions such as +12h to
org-matcher-time. The regexp this function uses to parse such relative
expressions already includes the "h" character but doesn't actually
handle that case.
AFAICT org-mode commit ec921a2a68 ("Support hourly repeat cookies")
neglected to add support here.
TINYCHANGE
* lisp/org.el (org-fast-tag-selection): Merge buffer local tags with
global alist of tags. And it obeys the option
org-complete-tags-always-offer-all-agenda-tags.
* doc/org-manual.org: Update the TAB key doc in tags selection UI.
* etc/ORG-NEWS: Mention the change in org-set-tags-command.
* doc/org-manual.org (Cache results of evaluation): Remove a
reference.
The reference leads to a bug report that does not clearly explain the
situation here. Also, it contains the string "@somewhere" that fails
to be correctly exported in Texinfo.
* lisp/org-capture.el (org-capture-templates): Enhance description and
add 'month' value for :tree-type in description.
* doc/org-manual.org: Fix typo for displaying 'month' in :tree-type
property.
TINYCHANGE
* doc/org-manual.org (Emacs Lisp forms as formulas): Be more
explicit about how fields are interpolated into the Lisp forms,
clarify the use of mode flags, and add a couple more examples.
* org-table.el (org-table-eval-formula): Add the `u` mode flag to
enable Calc's units simplification mode.
* test-org-table.el (test-org-table/mode-string-u): Add Unit test for
the new mode flag.
* org-manual.org: Document new mode flag.
* doc/org-manual.org (Repeated tasks): Reorder repeat cookies so that
their order matches the order of the labels at the beginning of the
sentence.
TINYCHANGE
With the conflict resolution in 9410fbe06 (Merge branch 'maint',
2020-09-06), what was footnote definition 89 got moved to 161, but the
reference remained 89. Re-link the footnote and definition, and then
renumber and sort the footnotes.
* doc/org-manual.org: Remove the language list and fix the Worg link
since the languages page has moved. Renumber footnotes.
The language list in the manual is missing many languages. Rather
than trying to keep the list up to date in two places that link to
each other, this removes the list from the manual which is updated
less frequently. There were a few footnotes in the table, so this
also renumbers the remaining footnotes.
The languages page was moved in Worg to make it the index page in the
languages directory. This updates the link in the manual to point to
its new location.
* doc/org-manual.org (Type): Document empty vector argument for
file-desc.
* etc/ORG-NEWS (New argument for ~file-desc~ babel header): Add entry
to NEWS.
* lisp/ob-core.el (org-babel--file-desc): Add new function to evaluate
file description value.
(org-babel-execute-src-block): Correctly evaluate file description
when executing src block.
(org-babel-insert-result): Correctly evaluate file description value
when inserting the result of src block execution into the buffer.
* testing/lisp/test-ob.el (test-ob/file-desc-header-argument): Add
test case for new behavior.
* lisp/org-capture.el (org-capture-templates)
(org-capture-fill-template): Enable declaring a default value
when prompting for a property during capture.
* lisp/org.el (org-read-property-value): Add parameter DEFAULT
for an initial/default/suggested property value.
* doc/org-manual.org: Document declaring a default value for a
prompted property during capture.
* doc/org-manual.org: Document new %L capture template formatting
directive.
* lisp/org-capture.el (org-capture-templates): Document new %L capture
template formatting directive.
* lisp/org-capture.el (org-capture-fill-template): Add in support for
%L, bare link formatting, in org-capture-fill-template.
TINYCHANGE
* doc/org-manual.org (Summary of In-Buffer Settings): Fix archive
example.
The provided example '%s_done' is not valid syntax for archive
location. Should be '%s_done::'.
* doc/org-manual.org (Tables in HTML export): Fix syntax of example.
The example in the "Tables in HTML export" section of the manual
uses the old syntax: `border="2"' etc.
Change it to use `:border 2' etc.
* doc/org-manual.org (JavaScript supported display of web pages):
Small rephrasing.
(Exporting to minimal HTML): New section.
Reported-by: Paramjit Singh <paramjitrohits@gmail.com>
* doc/org-manual.org (Results of Evaluation): Distinguish between
behavior when the :file-desc header argument is not present and when
it has no value.
The current handling of the :file-desc argument is to omit the
description if the header argument isn't present and to use the :file
value as the description if :file-desc is present without a value.
This matches the original intention [*].
[*] https://orgmode.org/list/87vclky211.fsf@med.uni-goettingen.de
Reported-by: Matt Huszagh <huszaghmatt@gmail.com>
https://orgmode.org/list/87sgbzl6uy.fsf@gmail.com
* ob-core.el (org-babel-execute-src-block): Source code block header
argument `:file-mode' can set file permissions if `:file' argument is
provided.
(org-babel-common-header-args-w-values): Add `:file-mode' to common
header arguments.
TINYCHANGE
Kyle Meyer
Stefan Kangas
TEC
Daniel Gröber
stardiviner
Bastien
Gustav Wikström
Florian Dufour
Daniele Nicolodi
Dieter Faulbaum
Greg Minshall
Ian Martins
Matt Huszagh
Phil Hudson
David Masterson
Samuel W. Flint
Ihor Radchenko
Nick Dokos
Bastien Guerry
John Herrlin
Marco Wahl