branch: externals/denote
commit 06cc35ab809b5c482015af84bda381ed2a5c4b30
Author: Protesilaos Stavrou <[email protected]>
Commit: Protesilaos Stavrou <[email protected]>
Fix wrapping in commit 1c3f404 and acknowledge Tobias Lidman-Strauss for it
The commit was done in merge request 2 on the GitLab mirror:
<https://gitlab.com/protesilaos/denote/-/merge_requests/2>.
---
README.org | 15 ++++++++-------
denote.el | 5 +++--
2 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/README.org b/README.org
index 1dc6a8fdd5..ae7f42f8f5 100644
--- a/README.org
+++ b/README.org
@@ -991,8 +991,9 @@ the date and identifier fields specified. It also makes
the file name
consist of only the identifier plus the Org file name extension
([[#h:4e9c7512-84dc-4dfb-9fa9-e15d51178e5d][The file-naming scheme]]).
Otherwise, it produces a minibuffer prompt for every non-nil value
-that corresponds to the =TITLE=, =KEYWORDS=, =SUBDIRECTORY=, =DATE=,
=TEMPLATE=, and =SIGNATURE= arguments. The prompts are those used by the
standard
-~denote~ command and all of its utility commands
([[#h:17896c8c-d97a-4faa-abf6-31df99746ca6][Points of entry]]).
+that corresponds to the =TITLE=, =KEYWORDS=, =SUBDIRECTORY=, =DATE=,
+=TEMPLATE=, and =SIGNATURE= arguments. The prompts are those used by
+the standard ~denote~ command and all of its utility commands
([[#h:17896c8c-d97a-4faa-abf6-31df99746ca6][Points of entry]]).
When returning the contents that fill in the Org capture template, the
sequence is as follows: front matter, =TEMPLATE=, and then the value
@@ -6848,11 +6849,11 @@ Denote is meant to be a collective effort. Every bit
of help matters.
Maikol Solis, Marc Fargas, Matthew Lemon, Noboru Ota (nobiot),
Norwid Behrnd, Octavian, Peter Prevos, Philip Kaludercic, Ryota,
Quiliro Ordóñez, Stephen R. Kifer, Stefan Monnier, Stefan Thesing,
- Thibaut Benjamin, Tomasz Hołubowicz, TomoeMami , Vedang Manerikar,
- Wesley Harvey, Yann Dutrieux, Zhenxu Xu, arsaber101, bryanrinders,
- eum3l, experimental-code-86, ezchi, jarofromel, leinfink (Henrik),
- l-o-l-h (Lincoln), mattyonweb, maxbrieiev, mentalisttraceur,
- pmenair, relict007, skissue.
+ Thibaut Benjamin, Tobias Lidman-Strauss, Tomasz Hołubowicz,
+ TomoeMami , Vedang Manerikar, Wesley Harvey, Yann Dutrieux, Zhenxu
+ Xu, arsaber101, bryanrinders, eum3l, experimental-code-86, ezchi,
+ jarofromel, leinfink (Henrik), l-o-l-h (Lincoln), mattyonweb,
+ maxbrieiev, mentalisttraceur, pmenair, relict007, skissue.
+ Ideas and/or user feedback :: Abin Simon, Aditya Yadav, Alan
Schmitt, Aleksandr Vityazev, Alex Griffin, Alex Hirschfeld, Alexis
diff --git a/denote.el b/denote.el
index b9c13afcb2..4ce6ea284a 100644
--- a/denote.el
+++ b/denote.el
@@ -7049,8 +7049,9 @@ the date and identifier fields specified. Also make the
file
name consist of only the identifier plus the Org file name
extension.
-Otherwise produce a minibuffer prompt for every non-nil value
-that corresponds to the TITLE, KEYWORDS, SUBDIRECTORY, DATE, TEMPLATE,
SIGNATURE arguments. The prompts are those used by the standard
+Otherwise produce a minibuffer prompt for every non-nil value that
+corresponds to the TITLE, KEYWORDS, SUBDIRECTORY, DATE, TEMPLATE,
+SIGNATURE arguments. The prompts are those used by the standard
`denote' command and all of its utility commands.
When returning the contents that fill in the Org capture
