branch: externals/denote
commit fcf5bccfd5e5e7a2374de868963cfe77043e5d90
Author: Protesilaos Stavrou <[email protected]>
Commit: Protesilaos Stavrou <[email protected]>
Use a more obvious name for denote-excluded-keywords-regexp
---
README.org | 15 ++++++++++-----
denote.el | 13 +++++++++----
2 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/README.org b/README.org
index f9b2d33732..3638cc829f 100644
--- a/README.org
+++ b/README.org
@@ -230,7 +230,7 @@ Here we include more of what you can configure with Denote
([[#h:998ae528-9276-4
(setq denote-sort-keywords t)
(setq denote-prompts '(title keywords))
(setq denote-excluded-directories-regexp nil)
- (setq denote-excluded-keywords-regexp nil)
+ (setq denote-keywords-to-not-infer-regexp nil)
(setq denote-rename-confirmations '(rewrite-front-matter modify-file-name))
;; Pick dates, where relevant, with Org's advanced interface:
@@ -1489,9 +1489,12 @@ The match is performed with ~string-match-p~.
:CUSTOM_ID: h:69e518ee-ed43-40ab-a5f4-c780a23e5358
:END:
-#+vindex: denote-excluded-keywords-regexp
-The user option ~denote-excluded-keywords-regexp~ omits keywords that
-match a regular expression from the list of inferred keywords.
+#+vindex: denote-keywords-to-not-infer-regexp
+The user option ~denote-keywords-to-not-infer-regexp~ omits keywords
+that match a regular expression from the list of inferred keywords.
+
+[ The ~denote-excluded-keywords-regexp~ is an obsolete alias for
+ ~denote-keywords-to-not-infer-regexp~ as part of {{{development-version}}}. ]
Keywords are inferred from file names and provided at relevant prompts
as completion candidates when the user option ~denote-infer-keywords~
@@ -5462,7 +5465,9 @@ The following sections cover the specifics.
([[#h:6a92a8b5-d766-42cc-8e5b-8dc255466a23][Standard note creation]]). In
the case of keyword inferrence, use
optional =FILES-MATCHING-REGEXP=, to extract keywords only from the
matching files. Otherwise, do it for all files. Filter inferred
- keywords with the user option ~denote-excluded-keywords-regexp~.
+ keywords with the user option ~denote-keywords-to-not-infer-regexp~.
+ [ The ~denote-excluded-keywords-regexp~ is an obsolete alias for
+ ~denote-keywords-to-not-infer-regexp~ as part of
{{{development-version}}}. ]
#+findex: denote-keywords-sort
+ Function ~denote-keywords-sort~ :: Sort =KEYWORDS= if
diff --git a/denote.el b/denote.el
index e3acf0729e..48396c3dc7 100644
--- a/denote.el
+++ b/denote.el
@@ -676,7 +676,12 @@ The match is performed with `string-match-p'."
:package-version '(denote . "1.2.0")
:type 'string)
-(defcustom denote-excluded-keywords-regexp nil
+(define-obsolete-variable-alias
+ 'denote-excluded-keywords-regexp
+ 'denote-keywords-to-not-infer-regexp
+ "4.2.0")
+
+(defcustom denote-keywords-to-not-infer-regexp nil
"Regular expression of keywords to not infer.
Keywords are inferred from file names and provided at relevant
prompts as completion candidates when the user option
@@ -684,7 +689,7 @@ prompts as completion candidates when the user option
The match is performed with `string-match-p'."
:group 'denote
- :package-version '(denote . "1.2.0")
+ :package-version '(denote . "4.2.0")
:type 'string)
(defcustom denote-excluded-files-regexp nil
@@ -2012,7 +2017,7 @@ Keep any duplicates. Users who do not want duplicates
should refer to
the functions `denote-keywords'."
(when-let* ((files (denote-directory-files files-matching-regexp))
(keywords (mapcan #'denote-extract-keywords-from-path files)))
- (if-let* ((regexp denote-excluded-keywords-regexp))
+ (if-let* ((regexp denote-keywords-to-not-infer-regexp))
(seq-remove
(lambda (k)
(string-match-p regexp k))
@@ -2029,7 +2034,7 @@ In the case of keyword inferrence, use optional
FILES-MATCHING-REGEXP,
to extract keywords only from the matching files. Otherwise, do it for
all files.
-Filter inferred keywords with the user option
`denote-excluded-keywords-regexp'."
+Filter inferred keywords per `denote-keywords-to-not-infer-regexp'."
(delete-dups
(if denote-infer-keywords
(append (denote-infer-keywords-from-files files-matching-regexp)
denote-known-keywords)
