emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] externals/denote 25fa79e8d9 146/355: Refine denote-retrieve inter


From: ELPA Syncer
Subject: [elpa] externals/denote 25fa79e8d9 146/355: Refine denote-retrieve internals
Date: Sun, 26 Jun 2022 23:58:15 -0400 (EDT)

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

    Refine denote-retrieve internals
---
 denote-retrieve.el | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/denote-retrieve.el b/denote-retrieve.el
index 8ee9037b75..105956d0b9 100644
--- a/denote-retrieve.el
+++ b/denote-retrieve.el
@@ -35,14 +35,14 @@
   "Regular expression for title key and value.
 
 The match that needs to be extracted is explicityly marked as
-group 1.  `denote-retrieve--find-value' uses the group 1 sting.")
+group 1.")
 
 (defconst denote-retrieve--identifier-regexp
   "^.?.?\\b\\(?:identifier\\|ID\\)\\s-*[:=]\\s-*\"?\\(?1:[0-9T]+\\)"
   "Regular expression for filename key and value.
 
 The match that needs to be extracted is explicityly marked as
-group 1.  `denote-retrieve--find-value' uses the group 1 sting.")
+group 1.")
 
 (defun denote-retrieve--search (regexp)
   "Search for REGEXP in the current buffer."
@@ -53,18 +53,14 @@ group 1.  `denote-retrieve--find-value' uses the group 1 
sting.")
       (re-search-forward regexp nil t 1)
       (match-string-no-properties 1))))
 
-(defun denote-retrieve--find-value (regexp)
-  "Return value from REGEXP by searching the file."
-  (or (denote-retrieve--search regexp)
-      (user-error "Cannot retrieve %s" regexp)))
-
-(defun denote-retrieve--retrieve-value (file regexp)
+(defun denote-retrieve--value (file regexp)
   "Return REGEXP value from FILE.
 FILE is a note in the variable `denote-directory'."
   (let ((default-directory (denote-directory)))
     (with-temp-buffer
       (insert-file-contents-literally file)
-      (denote-retrieve--find-value regexp))))
+      (or (denote-retrieve--search regexp)
+          (user-error "Cannot retrieve %s in %s" regexp file)))))
 
 (defun denote-retrieve--read-file-prompt ()
   "Prompt for regular file in variable `denote-directory'."



reply via email to

[Prev in Thread] Current Thread [Next in Thread]