branch: externals/denote
commit c4b3187039fa1d4838070b95f77de3e401a8630e
Author: Protesilaos Stavrou <[email protected]>
Commit: Protesilaos Stavrou <[email protected]>
Make 'denote-files' Org dynamic block file separator opt-in
This means that we do not introduce a separator by default. The 'nil'
value now means what it should.
---
README.org | 14 +++++++-------
denote-org-dblock.el | 4 ++--
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/README.org b/README.org
index d9e891a248..d478230e56 100644
--- a/README.org
+++ b/README.org
@@ -2522,7 +2522,7 @@ or manually write the following block in an Org file and
then type
To fully control the output, include these additional optional
parameters, which are described further below:
-: #+BEGIN: denote-files :regexp "YOUR REGEXP HERE" :sort-by-component nil
:reverse-sort nil :no-front-matter nil :file-separator t :add-links nil
+: #+BEGIN: denote-files :regexp "YOUR REGEXP HERE" :sort-by-component nil
:reverse-sort nil :no-front-matter nil :file-separator nil :add-links nil
:
: #+END:
@@ -2548,12 +2548,12 @@ parameters, which are described further below:
#+vindex: denote-org-dblock-file-contents-separator
- The =:file-separator= parameter is optional. If it is omitted, then
- Denote will use the ~denote-org-dblock-file-contents-separator~: it
- introduces some empty lines and a horizontal rule between them to
- visually distinguish individual files. If the =:file-separator=
- value is a string, it is used as the file separator (e.g. use ="\n"=
- to insert just one empty new line). If the =:file-separator= value
- is set to =none=, no separator is used.
+ Denote will use no separator between the files it inserts. If the
+ value is ~t~ the ~denote-org-dblock-file-contents-separator~ is
+ applied at the end of each file: it introduces some empty lines and
+ a horizontal rule between them to visually distinguish individual
+ files. If the =:file-separator= value is a string, it is used as the
+ file separator (e.g. use ="\n"= to insert just one empty new line).
- The =:no-front-matter= parameter is optional. When set to a ~t~
value, Denote tries to remove front matter from the files it is
diff --git a/denote-org-dblock.el b/denote-org-dblock.el
index 5b4466d9fe..24e22f3fa9 100644
--- a/denote-org-dblock.el
+++ b/denote-org-dblock.el
@@ -176,7 +176,7 @@ argument."
(defun denote-org-dblock--separator (separator)
"Return appropriate value of SEPARATOR for `denote-org-dblock-add-files'."
(cond
- ((eq separator 'none) "")
+ ((null separator) "")
((stringp separator) separator)
(t denote-org-dblock-file-contents-separator)))
@@ -227,7 +227,7 @@ among `denote-sort-components'."
:sort-by-component sort-by-component
:reverse-sort nil
:no-front-matter nil
- :file-separator t
+ :file-separator nil
:add-links nil))
(org-update-dblock))
