[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/denote b179ea3178 13/17: Refactor denote--get-title-lin
From: |
ELPA Syncer |
Subject: |
[elpa] externals/denote b179ea3178 13/17: Refactor denote--get-title-line-from-front-matter and denote--get-keywords-line-from-front-matter |
Date: |
Mon, 15 Aug 2022 01:57:35 -0400 (EDT) |
branch: externals/denote
commit b179ea3178d3b0338f3149c850fab42e72e8f188
Author: Jean-Philippe Gagné Guay <jeanphilippe150@gmail.com>
Commit: Jean-Philippe Gagné Guay <jeanphilippe150@gmail.com>
Refactor denote--get-title-line-from-front-matter and
denote--get-keywords-line-from-front-matter
Return the title and keywords lines with the formatted title and keywords
---
denote.el | 23 +++++++++++------------
1 file changed, 11 insertions(+), 12 deletions(-)
diff --git a/denote.el b/denote.el
index ad5b645c5e..b41ea024b9 100644
--- a/denote.el
+++ b/denote.el
@@ -743,10 +743,11 @@ Based on FILE-TYPE."
Based on FILE-TYPE."
(plist-get (alist-get file-type denote-file-types)
:keywords-value-reverse-function))
-(defun denote--get-title-line-from-front-matter (file-type)
+(defun denote--get-title-line-from-front-matter (title file-type)
"Retrieve title line from front matter based on FILE-TYPE.
-Does not contains the newline."
- (let ((front-matter (denote--front-matter file-type))
+Format TITLE in the title line. The returned line does not
+contain the newline."
+ (let ((front-matter (denote--format-front-matter title "" nil "" file-type))
(key-regexp (denote--title-key-regexp file-type)))
(with-temp-buffer
(insert front-matter)
@@ -754,10 +755,11 @@ Does not contains the newline."
(when (re-search-forward key-regexp nil t 1)
(buffer-substring-no-properties (point-at-bol) (point-at-eol))))))
-(defun denote--get-keywords-line-from-front-matter (file-type)
+(defun denote--get-keywords-line-from-front-matter (keywords file-type)
"Retrieve keywords line from front matter based on FILE-TYPE.
-Does not contain the newline."
- (let ((front-matter (denote--front-matter file-type))
+Format KEYWORDS in the keywords line. The returned line does not
+contain the newline."
+ (let ((front-matter (denote--format-front-matter "" "" keywords ""
file-type))
(key-regexp (denote--keywords-key-regexp file-type)))
(with-temp-buffer
(insert front-matter)
@@ -1325,8 +1327,7 @@ operation on multiple files."
(goto-char (point-min))
(when (re-search-forward (denote--keywords-key-regexp file-type) nil t
1)
(goto-char (point-at-bol))
- (insert (format (denote--get-keywords-line-from-front-matter
file-type)
- (denote--format-front-matter-keywords keywords
file-type)))
+ (insert (denote--get-keywords-line-from-front-matter keywords
file-type))
(delete-region (point) (point-at-eol)))))))
;; FIXME 2022-07-25: We should make the underlying regular expressions
@@ -1339,10 +1340,8 @@ renaming command and are used to construct new front
matter
values if appropriate."
(when-let* ((old-title-line (denote--retrieve-title-line file file-type))
(old-keywords-line (denote--retrieve-keywords-line file
file-type))
- (new-title-line (format
(denote--get-title-line-from-front-matter file-type)
- (denote--format-front-matter-title title
file-type)))
- (new-keywords-line (format
(denote--get-keywords-line-from-front-matter file-type)
- (denote--format-front-matter-keywords
keywords file-type))))
+ (new-title-line (denote--get-title-line-from-front-matter title
file-type))
+ (new-keywords-line (denote--get-keywords-line-from-front-matter
keywords file-type)))
(with-current-buffer (find-file-noselect file)
(when (y-or-n-p (format
"Replace front matter?\n-%s\n+%s\n\n-%s\n+%s?"
- [elpa] externals/denote e14ca11118 03/17: Implement accessor functions for denote--file-types, (continued)
- [elpa] externals/denote e14ca11118 03/17: Implement accessor functions for denote--file-types, ELPA Syncer, 2022/08/15
- [elpa] externals/denote a270951e9b 07/17: Rename denote--retrieve-value-title and denote--retrieve-value-keywords, ELPA Syncer, 2022/08/15
- [elpa] externals/denote f9fbebd9e4 09/17: Use plists in denote-file-types, ELPA Syncer, 2022/08/15
- [elpa] externals/denote b3cd0a7d4c 02/17: Add denote--file-types, ELPA Syncer, 2022/08/15
- [elpa] externals/denote 759fe4cb4e 10/17: Fix denote--filetype-heuristics, ELPA Syncer, 2022/08/15
- [elpa] externals/denote 685152876e 08/17: Rename denote--file-types to denote-file-types, ELPA Syncer, 2022/08/15
- [elpa] externals/denote c7d8d07119 12/17: Rename save-excursion and save-restriction when using with-temp-buffer, ELPA Syncer, 2022/08/15
- [elpa] externals/denote 1eb8d368b1 04/17: Refactor many functions to use denote--file-types, ELPA Syncer, 2022/08/15
- [elpa] externals/denote 9ea4078fb3 06/17: Remove denote--front-matter-keywords-to-list and use denote--retrieve-value-keywords instead, ELPA Syncer, 2022/08/15
- [elpa] externals/denote 4dc13f44e5 05/17: Refactor denote--migrate-type-files and use denote--retrieve-keywords-line, ELPA Syncer, 2022/08/15
- [elpa] externals/denote b179ea3178 13/17: Refactor denote--get-title-line-from-front-matter and denote--get-keywords-line-from-front-matter,
ELPA Syncer <=