[elpa] externals/denote adf7dd6b33: Fix how keywords are inferred and combined

[ELPA Syncer]

branch: externals/denote
commit adf7dd6b3389c712f2373127f730b3d1369e3370
Author: Protesilaos Stavrou <info@protesilaos.com>
Commit: Protesilaos Stavrou <info@protesilaos.com>

    Fix how keywords are inferred and combined
    
    The previous code did not work properly when the user option
    'denote-infer-keywords' was nil.  It would return a list of symbols,
    with the parentheses, whereas the file name needs a string where each
    keyword is delimited by an underscore.
---
 denote.el | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/denote.el b/denote.el
index 9fd5f24a11..3183d55368 100644
--- a/denote.el
+++ b/denote.el
@@ -393,8 +393,14 @@ part of the list."
             sequence)))
 
 (defun denote-keywords ()
-  "Combine `denote--inferred-keywords' with `denote-known-keywords'."
-  (delete-dups (append (denote--inferred-keywords) denote-known-keywords)))
+  "Return appropriate list of keyword candidates.
+If `denote-infer-keywords' is non-nil, infer keywords from
+existing notes and combine them into a list with
+`denote-known-keywords'.  Else use only the latter."
+  (delete-dups
+   (if denote-infer-keywords
+       (append (denote--inferred-keywords) denote-known-keywords)
+     denote-known-keywords)))
 
 (defvar denote--keyword-history nil
   "Minibuffer history of inputted keywords.")
@@ -460,9 +466,7 @@ or equivalent: they will all be converted into a single 
string.
 EXTENSION is the file type extension, either a string which
 include the starting dot or the return value of
 `denote--file-extension'."
-  (let ((kws (if denote-infer-keywords
-                 (denote--keywords-combine keywords)
-               keywords))
+  (let ((kws (denote--keywords-combine keywords))
         (ext (or extension (denote--file-extension))))
     (format "%s%s--%s__%s%s" path id slug kws ext)))