branch: externals/denote
commit 0d992fa74d9aa85e675f8e83b0feb016be62b2d5
Merge: 89071cffce 27b8f0ad1d
Author: Protesilaos Stavrou <[email protected]>
Commit: Protesilaos Stavrou <[email protected]>
Merge branch 'main' into query-links
---
README.org | 4 +---
denote.el | 14 ++++++--------
2 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/README.org b/README.org
index df6c4a6510..c1c9d80ec3 100644
--- a/README.org
+++ b/README.org
@@ -2667,7 +2667,7 @@ the command ~org-open-at-point~).
[ Revised to also support context links that do not use a =PROPERTIES=
drawer but which are easier to break. This is done as part of
- {{{development-version}}}. ]
+ {{{development-version}}}. Also revised to have a nil value by default. ]
#+vindex: denote-org-store-link-to-heading
The user option ~denote-org-store-link-to-heading~ determines whether
@@ -2684,8 +2684,6 @@ example:
: [[denote:20240118T060608][Some test]]
-This is what Denote was doing in versions prior to 2.3.0.
-
If the value is ~context~, the link consists of the file's identifier
and the text of the current heading, like this:
diff --git a/denote.el b/denote.el
index 418c1a5328..5a4222cd24 100644
--- a/denote.el
+++ b/denote.el
@@ -496,7 +496,7 @@ and/or when the user invokes the command `denote-date'."
:package-version '(denote . "0.6.0")
:type 'boolean)
-(defcustom denote-org-store-link-to-heading 'id
+(defcustom denote-org-store-link-to-heading nil
"Determine whether `org-store-link' links to the current Org heading.
[ Remember that what `org-store-link' does is merely collect a link. To
@@ -510,8 +510,6 @@ example:
[[denote:20240118T060608][Some test]]
-This is what Denote was doing in versions prior to 2.3.0.
-
If the value is `context', the link consists of the file's identifier
and the text of the current heading, like this:
@@ -558,10 +556,10 @@ navigates to that heading.
identifier of the file, even if this user option is set to a
non-nil value. ]"
:group 'denote
- :package-version '(denote . "3.2.0")
- :type '(choice (const :tag "No link to heading" nil)
+ :package-version '(denote . "4.0.0")
+ :type '(choice (const :tag "No link to heading (default)" nil)
(const :tag "Link to the context" context)
- (const :tag "Link wtih CUSTOM_ID" id)))
+ (const :tag "Link wtih CUSTOM_ID, creating it if needed" id)))
(defcustom denote-templates nil
"Alist of content templates for new notes.
@@ -1403,7 +1401,7 @@ something like .org even if the actual file extension is
(car files)
(seq-find
(lambda (file)
- (let ((file-extension (denote-get-file-extension file)))
+ (let ((file-extension (denote-get-file-extension-sans-encryption
file)))
(and (denote-file-has-supported-extension-p file)
(or (string= (denote--file-extension denote-file-type)
file-extension)
@@ -1773,7 +1771,7 @@ When called from Lisp, the arguments are a string, a
symbol among
buffer-name)
(message "No matching files for: %s" files-matching-regexp))))
-(defalias 'denote-sort-dired 'denote-dired
+(defalias 'denote-dired 'denote-sort-dired
"Alias for `denote-sort-dired' command.")
;;;; Keywords
