[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/denote 0afea4ee71 5/6: Simplify denote--retrieve-title-
From: |
ELPA Syncer |
Subject: |
[elpa] externals/denote 0afea4ee71 5/6: Simplify denote--retrieve-title-or-filename |
Date: |
Mon, 15 Aug 2022 05:57:39 -0400 (EDT) |
branch: externals/denote
commit 0afea4ee7152911544278fe0dbfa4d15fe0ead4c
Author: Protesilaos Stavrou <info@protesilaos.com>
Commit: Protesilaos Stavrou <info@protesilaos.com>
Simplify denote--retrieve-title-or-filename
---
denote.el | 21 ++++++++++-----------
1 file changed, 10 insertions(+), 11 deletions(-)
diff --git a/denote.el b/denote.el
index 88e849a31c..6093454d1b 100644
--- a/denote.el
+++ b/denote.el
@@ -792,11 +792,13 @@ contain the newline."
(error "Cannot find `%s' as a file" file)))
(defun denote--retrieve-filename-title (file)
- "Extract title from FILE name."
- (when (and (file-exists-p file)
- (denote--file-has-identifier-p file))
- (string-match denote--title-regexp file)
- (match-string 1 file)))
+ "Extract title from FILE name, else return `file-name-base'"
+ (if (and (file-exists-p file)
+ (denote--file-has-identifier-p file))
+ (progn
+ (string-match denote--title-regexp file)
+ (match-string 1 file))
+ (file-name-base file)))
(defun denote--retrieve-title-value (file file-type)
"Return title value from FILE according to FILE-TYPE."
@@ -851,12 +853,9 @@ If optional KEY is non-nil, return the key instead."
(defun denote--retrieve-title-or-filename (file type)
"Return appropriate title for FILE given its TYPE."
- (cond
- ((denote--only-note-p file)
- (denote--retrieve-title-value file type))
- (t (if-let ((title (denote--retrieve-filename-title file)))
- title
- (file-name-base file)))))
+ (if (denote--only-note-p file)
+ (denote--retrieve-title-value file type)
+ (denote--retrieve-filename-title file)))
(defun denote--retrieve-read-file-prompt ()
"Prompt for regular file in variable `denote-directory'."
- [elpa] externals/denote updated (37dd43bb22 -> 317b9927f5), ELPA Syncer, 2022/08/15
- [elpa] externals/denote 137f2a57f3 1/6: Remove useless progn, ELPA Syncer, 2022/08/15
- [elpa] externals/denote c9b5806c5b 2/6: Rename function that returns title, ELPA Syncer, 2022/08/15
- [elpa] externals/denote 91b626aa1c 3/6: Make links use denote--retrieve-title-or-filename, ELPA Syncer, 2022/08/15
- [elpa] externals/denote bdba736be9 4/6: Refine file name retrieval, ELPA Syncer, 2022/08/15
- [elpa] externals/denote 317b9927f5 6/6: Don't use empty string as default in title prompt, ELPA Syncer, 2022/08/15
- [elpa] externals/denote 0afea4ee71 5/6: Simplify denote--retrieve-title-or-filename,
ELPA Syncer <=